diff --git a/softwareDirectory/AutoVerScheme/AutoVerScheme.pro.user b/softwareDirectory/AutoVerScheme/AutoVerScheme.pro.user index a7c95f9..73103be 100644 --- a/softwareDirectory/AutoVerScheme/AutoVerScheme.pro.user +++ b/softwareDirectory/AutoVerScheme/AutoVerScheme.pro.user @@ -1,6 +1,6 @@ - + EnvironmentId diff --git a/softwareDirectory/AutoVerScheme/AutoVerScheme.pro.user b/softwareDirectory/AutoVerScheme/AutoVerScheme.pro.user index a7c95f9..73103be 100644 --- a/softwareDirectory/AutoVerScheme/AutoVerScheme.pro.user +++ b/softwareDirectory/AutoVerScheme/AutoVerScheme.pro.user @@ -1,6 +1,6 @@ - + EnvironmentId diff --git a/softwareDirectory/AutoVerScheme/checkwindow.cpp b/softwareDirectory/AutoVerScheme/checkwindow.cpp index da86ad4..2f3e8c6 100644 --- a/softwareDirectory/AutoVerScheme/checkwindow.cpp +++ b/softwareDirectory/AutoVerScheme/checkwindow.cpp @@ -36,13 +36,90 @@ void CheckWindow::showMethod() { - ui->stackedWidget->setCurrentIndex(1); - getCheckMethod(); + QString ids; + for(int i=0;itableWidgetDevice->rowCount();i++){ + Qt::CheckState state = ui->tableWidgetDevice->item(i,0)->checkState(); + if(state == Qt::Checked){ + if(ids=="") + ids = myTaskList[i].id; + else + ids +=";"+ myTaskList[i].id; + //break; + } + } + if(ids==""){ + QMessageBox::warning(this, "提示", "请选择被检设备！"); + }else{ + qDebug() << "select ids:" << ids; + ui->stackedWidget->setCurrentIndex(1); + getCheckMethod(); + } } void CheckWindow::showDevice() { - ui->stackedWidget->setCurrentIndex(2); + QString sId=""; + for(int i=0;itableWidgetMethod->rowCount();i++){ + Qt::CheckState state = ui->tableWidgetMethod->item(i,0)->checkState(); + if(state == Qt::Checked){ + sId = programList[i].id; + break; + } + } + if(sId==""){ + QMessageBox::warning(this, "提示", "请选择检定程序！"); + }else{ + programInfo = BaseCommonApi::getVerificationProgramInfo(sId); + initDeviceInfo(); + ui->stackedWidget->setCurrentIndex(2); + } +} + +void CheckWindow::initDeviceInfo() +{ + QString strStyle = QString("QLabel{image:url(%1);}").arg(programInfo.img_path); + qDebug() << "strStyle:" << strStyle; + ui->label_8->setStyleSheet(strStyle); + + ui->tableWidget_3->clearContents(); + ui->tableWidget_3->setRowCount(0); + QStringList idList; + int rowCount=0; + int row=0; + if(programInfo.tested_device_id!="") + { + idList = programInfo.tested_device_id.split(","); + for(const QString& id : idList) + { + QList result = BaseCommonApi::getTestedCatDevice(id); + if(result.length()>0){ + rowCount = ui->tableWidget_3->rowCount(); + + ui->tableWidget_3->insertRow(rowCount); + ui->tableWidget_3->setItem(row, 0, new QTableWidgetItem(result[0].equipment_name)); + ui->tableWidget_3->setItem(row, 1, new QTableWidgetItem("成功")); //设置数据 + row++; + } + } + idList.clear(); + } + + if(programInfo.standard_device_id!=""){ + idList = programInfo.standard_device_id.split(","); + for(const QString& id : idList) + { + QList result = BaseCommonApi::getCatDeviceInfor(id); + if(result.length()>0){ + rowCount = ui->tableWidget_3->rowCount(); + + ui->tableWidget_3->insertRow(rowCount); + ui->tableWidget_3->setItem(row, 0, new QTableWidgetItem(result[0].equipment_name)); + ui->tableWidget_3->setItem(row, 1, new QTableWidgetItem("成功")); //设置数据 + row++; + } + } + idList.clear(); + } } void CheckWindow::showCheck() @@ -109,7 +186,8 @@ ui->tableWidgetMethod->insertRow(rowCount); QTableWidgetItem* p_check = new QTableWidgetItem(); - p_check->setCheckState(Qt::Unchecked); //设置首列为 CheckBox 控件 + //p_check->setCheckState(Qt::Checked); //设置首列为 CheckBox 控件 + p_check->setCheckState(Qt::Unchecked); ui->tableWidgetMethod->setItem(row,0,p_check); ui->tableWidgetMethod->setItem(row, 1, new QTableWidgetItem(program.program_name)); //设置数据 ui->tableWidgetMethod->setItem(row, 2, new QTableWidgetItem(program.create_name)); //设置数据 @@ -141,3 +219,27 @@ { } + +void CheckWindow::on_tableWidgetDevice_cellChanged(int row, int column) +{ + +} + +void CheckWindow::on_tableWidgetMethod_cellChanged(int row, int column) +{ + Qt::CheckState state = ui->tableWidgetMethod->item(row,0)->checkState(); + if(state == Qt::Checked) + { + for(int i=0;itableWidgetMethod->rowCount();i++){ + if(i!=row) + { + ui->tableWidgetMethod->item(i,0)->setCheckState(Qt::Unchecked); + } + } + } +} + +void CheckWindow::on_pushButton_9_clicked() +{ + showDevice(); +} diff --git a/softwareDirectory/AutoVerScheme/AutoVerScheme.pro.user b/softwareDirectory/AutoVerScheme/AutoVerScheme.pro.user index a7c95f9..73103be 100644 --- a/softwareDirectory/AutoVerScheme/AutoVerScheme.pro.user +++ b/softwareDirectory/AutoVerScheme/AutoVerScheme.pro.user @@ -1,6 +1,6 @@ - + EnvironmentId diff --git a/softwareDirectory/AutoVerScheme/checkwindow.cpp b/softwareDirectory/AutoVerScheme/checkwindow.cpp index da86ad4..2f3e8c6 100644 --- a/softwareDirectory/AutoVerScheme/checkwindow.cpp +++ b/softwareDirectory/AutoVerScheme/checkwindow.cpp @@ -36,13 +36,90 @@ void CheckWindow::showMethod() { - ui->stackedWidget->setCurrentIndex(1); - getCheckMethod(); + QString ids; + for(int i=0;itableWidgetDevice->rowCount();i++){ + Qt::CheckState state = ui->tableWidgetDevice->item(i,0)->checkState(); + if(state == Qt::Checked){ + if(ids=="") + ids = myTaskList[i].id; + else + ids +=";"+ myTaskList[i].id; + //break; + } + } + if(ids==""){ + QMessageBox::warning(this, "提示", "请选择被检设备！"); + }else{ + qDebug() << "select ids:" << ids; + ui->stackedWidget->setCurrentIndex(1); + getCheckMethod(); + } } void CheckWindow::showDevice() { - ui->stackedWidget->setCurrentIndex(2); + QString sId=""; + for(int i=0;itableWidgetMethod->rowCount();i++){ + Qt::CheckState state = ui->tableWidgetMethod->item(i,0)->checkState(); + if(state == Qt::Checked){ + sId = programList[i].id; + break; + } + } + if(sId==""){ + QMessageBox::warning(this, "提示", "请选择检定程序！"); + }else{ + programInfo = BaseCommonApi::getVerificationProgramInfo(sId); + initDeviceInfo(); + ui->stackedWidget->setCurrentIndex(2); + } +} + +void CheckWindow::initDeviceInfo() +{ + QString strStyle = QString("QLabel{image:url(%1);}").arg(programInfo.img_path); + qDebug() << "strStyle:" << strStyle; + ui->label_8->setStyleSheet(strStyle); + + ui->tableWidget_3->clearContents(); + ui->tableWidget_3->setRowCount(0); + QStringList idList; + int rowCount=0; + int row=0; + if(programInfo.tested_device_id!="") + { + idList = programInfo.tested_device_id.split(","); + for(const QString& id : idList) + { + QList result = BaseCommonApi::getTestedCatDevice(id); + if(result.length()>0){ + rowCount = ui->tableWidget_3->rowCount(); + + ui->tableWidget_3->insertRow(rowCount); + ui->tableWidget_3->setItem(row, 0, new QTableWidgetItem(result[0].equipment_name)); + ui->tableWidget_3->setItem(row, 1, new QTableWidgetItem("成功")); //设置数据 + row++; + } + } + idList.clear(); + } + + if(programInfo.standard_device_id!=""){ + idList = programInfo.standard_device_id.split(","); + for(const QString& id : idList) + { + QList result = BaseCommonApi::getCatDeviceInfor(id); + if(result.length()>0){ + rowCount = ui->tableWidget_3->rowCount(); + + ui->tableWidget_3->insertRow(rowCount); + ui->tableWidget_3->setItem(row, 0, new QTableWidgetItem(result[0].equipment_name)); + ui->tableWidget_3->setItem(row, 1, new QTableWidgetItem("成功")); //设置数据 + row++; + } + } + idList.clear(); + } } void CheckWindow::showCheck() @@ -109,7 +186,8 @@ ui->tableWidgetMethod->insertRow(rowCount); QTableWidgetItem* p_check = new QTableWidgetItem(); - p_check->setCheckState(Qt::Unchecked); //设置首列为 CheckBox 控件 + //p_check->setCheckState(Qt::Checked); //设置首列为 CheckBox 控件 + p_check->setCheckState(Qt::Unchecked); ui->tableWidgetMethod->setItem(row,0,p_check); ui->tableWidgetMethod->setItem(row, 1, new QTableWidgetItem(program.program_name)); //设置数据 ui->tableWidgetMethod->setItem(row, 2, new QTableWidgetItem(program.create_name)); //设置数据 @@ -141,3 +219,27 @@ { } + +void CheckWindow::on_tableWidgetDevice_cellChanged(int row, int column) +{ + +} + +void CheckWindow::on_tableWidgetMethod_cellChanged(int row, int column) +{ + Qt::CheckState state = ui->tableWidgetMethod->item(row,0)->checkState(); + if(state == Qt::Checked) + { + for(int i=0;itableWidgetMethod->rowCount();i++){ + if(i!=row) + { + ui->tableWidgetMethod->item(i,0)->setCheckState(Qt::Unchecked); + } + } + } +} + +void CheckWindow::on_pushButton_9_clicked() +{ + showDevice(); +} diff --git a/softwareDirectory/AutoVerScheme/checkwindow.h b/softwareDirectory/AutoVerScheme/checkwindow.h index ea27646..d3fa0c3 100644 --- a/softwareDirectory/AutoVerScheme/checkwindow.h +++ b/softwareDirectory/AutoVerScheme/checkwindow.h @@ -22,13 +22,21 @@ void showMethodWidget(); void showResult(); void on_editButton_clicked(); + void on_tableWidgetDevice_cellChanged(int row, int column); + + void on_tableWidgetMethod_cellChanged(int row, int column); + + void on_pushButton_9_clicked(); + private: void getCheckDevice(); void getCheckMethod(); + void initDeviceInfo(); private: Ui::CheckWindow *ui; QList programList; QList myTaskList; + VerificationProgramInfo programInfo; }; #endif // CHECKWINDOW_H diff --git a/softwareDirectory/AutoVerScheme/AutoVerScheme.pro.user b/softwareDirectory/AutoVerScheme/AutoVerScheme.pro.user index a7c95f9..73103be 100644 --- a/softwareDirectory/AutoVerScheme/AutoVerScheme.pro.user +++ b/softwareDirectory/AutoVerScheme/AutoVerScheme.pro.user @@ -1,6 +1,6 @@ - + EnvironmentId diff --git a/softwareDirectory/AutoVerScheme/checkwindow.cpp b/softwareDirectory/AutoVerScheme/checkwindow.cpp index da86ad4..2f3e8c6 100644 --- a/softwareDirectory/AutoVerScheme/checkwindow.cpp +++ b/softwareDirectory/AutoVerScheme/checkwindow.cpp @@ -36,13 +36,90 @@ void CheckWindow::showMethod() { - ui->stackedWidget->setCurrentIndex(1); - getCheckMethod(); + QString ids; + for(int i=0;itableWidgetDevice->rowCount();i++){ + Qt::CheckState state = ui->tableWidgetDevice->item(i,0)->checkState(); + if(state == Qt::Checked){ + if(ids=="") + ids = myTaskList[i].id; + else + ids +=";"+ myTaskList[i].id; + //break; + } + } + if(ids==""){ + QMessageBox::warning(this, "提示", "请选择被检设备！"); + }else{ + qDebug() << "select ids:" << ids; + ui->stackedWidget->setCurrentIndex(1); + getCheckMethod(); + } } void CheckWindow::showDevice() { - ui->stackedWidget->setCurrentIndex(2); + QString sId=""; + for(int i=0;itableWidgetMethod->rowCount();i++){ + Qt::CheckState state = ui->tableWidgetMethod->item(i,0)->checkState(); + if(state == Qt::Checked){ + sId = programList[i].id; + break; + } + } + if(sId==""){ + QMessageBox::warning(this, "提示", "请选择检定程序！"); + }else{ + programInfo = BaseCommonApi::getVerificationProgramInfo(sId); + initDeviceInfo(); + ui->stackedWidget->setCurrentIndex(2); + } +} + +void CheckWindow::initDeviceInfo() +{ + QString strStyle = QString("QLabel{image:url(%1);}").arg(programInfo.img_path); + qDebug() << "strStyle:" << strStyle; + ui->label_8->setStyleSheet(strStyle); + + ui->tableWidget_3->clearContents(); + ui->tableWidget_3->setRowCount(0); + QStringList idList; + int rowCount=0; + int row=0; + if(programInfo.tested_device_id!="") + { + idList = programInfo.tested_device_id.split(","); + for(const QString& id : idList) + { + QList result = BaseCommonApi::getTestedCatDevice(id); + if(result.length()>0){ + rowCount = ui->tableWidget_3->rowCount(); + + ui->tableWidget_3->insertRow(rowCount); + ui->tableWidget_3->setItem(row, 0, new QTableWidgetItem(result[0].equipment_name)); + ui->tableWidget_3->setItem(row, 1, new QTableWidgetItem("成功")); //设置数据 + row++; + } + } + idList.clear(); + } + + if(programInfo.standard_device_id!=""){ + idList = programInfo.standard_device_id.split(","); + for(const QString& id : idList) + { + QList result = BaseCommonApi::getCatDeviceInfor(id); + if(result.length()>0){ + rowCount = ui->tableWidget_3->rowCount(); + + ui->tableWidget_3->insertRow(rowCount); + ui->tableWidget_3->setItem(row, 0, new QTableWidgetItem(result[0].equipment_name)); + ui->tableWidget_3->setItem(row, 1, new QTableWidgetItem("成功")); //设置数据 + row++; + } + } + idList.clear(); + } } void CheckWindow::showCheck() @@ -109,7 +186,8 @@ ui->tableWidgetMethod->insertRow(rowCount); QTableWidgetItem* p_check = new QTableWidgetItem(); - p_check->setCheckState(Qt::Unchecked); //设置首列为 CheckBox 控件 + //p_check->setCheckState(Qt::Checked); //设置首列为 CheckBox 控件 + p_check->setCheckState(Qt::Unchecked); ui->tableWidgetMethod->setItem(row,0,p_check); ui->tableWidgetMethod->setItem(row, 1, new QTableWidgetItem(program.program_name)); //设置数据 ui->tableWidgetMethod->setItem(row, 2, new QTableWidgetItem(program.create_name)); //设置数据 @@ -141,3 +219,27 @@ { } + +void CheckWindow::on_tableWidgetDevice_cellChanged(int row, int column) +{ + +} + +void CheckWindow::on_tableWidgetMethod_cellChanged(int row, int column) +{ + Qt::CheckState state = ui->tableWidgetMethod->item(row,0)->checkState(); + if(state == Qt::Checked) + { + for(int i=0;itableWidgetMethod->rowCount();i++){ + if(i!=row) + { + ui->tableWidgetMethod->item(i,0)->setCheckState(Qt::Unchecked); + } + } + } +} + +void CheckWindow::on_pushButton_9_clicked() +{ + showDevice(); +} diff --git a/softwareDirectory/AutoVerScheme/checkwindow.h b/softwareDirectory/AutoVerScheme/checkwindow.h index ea27646..d3fa0c3 100644 --- a/softwareDirectory/AutoVerScheme/checkwindow.h +++ b/softwareDirectory/AutoVerScheme/checkwindow.h @@ -22,13 +22,21 @@ void showMethodWidget(); void showResult(); void on_editButton_clicked(); + void on_tableWidgetDevice_cellChanged(int row, int column); + + void on_tableWidgetMethod_cellChanged(int row, int column); + + void on_pushButton_9_clicked(); + private: void getCheckDevice(); void getCheckMethod(); + void initDeviceInfo(); private: Ui::CheckWindow *ui; QList programList; QList myTaskList; + VerificationProgramInfo programInfo; }; #endif // CHECKWINDOW_H diff --git a/softwareDirectory/AutoVerScheme/checkwindow.ui b/softwareDirectory/AutoVerScheme/checkwindow.ui index 1f7ef8c..c486dcf 100644 --- a/softwareDirectory/AutoVerScheme/checkwindow.ui +++ b/softwareDirectory/AutoVerScheme/checkwindow.ui @@ -548,13 +548,7 @@ - - - - 0 - 0 - - + 120 @@ -812,6 +806,237 @@ 设备接口设置 + + + + + + 12 + + + + 串口 + + + + + + + + 12 + + + + 端口号: + + + + + + + + 12 + + + + true + + + + + + + + 12 + + + + 波特率: + + + + + + + + 12 + + + + true + + + 9600 + + + 1 + + + + 4800 + + + + + 9600 + + + + + 14400 + + + + + 19200 + + + + + 38400 + + + + + + + + + 12 + + + + 校验位: + + + + + + + + 12 + + + + + None + + + + + Odd + + + + + Even + + + + + + + + + 12 + + + + 数据位: + + + + + + + + 12 + + + + 1 + + + + 7 + + + + + 8 + + + + + + + + + 12 + + + + 停止位: + + + + + + + + 12 + + + + 1 + + + + None + + + + + One + + + + + Two + + + + + OnePointFive + + + + + + + + + 12 + + + + VISA + + + + + + + + 12 + + + + true + + + + @@ -1057,34 +1282,18 @@ - pushButton_12 + pushButton_13 clicked() CheckWindow - showMethod() + showCheck() - 137 - 205 + 1095 + 571 - 666 - 394 - - - - - pushButton_12 - clicked() - CheckWindow - showDevice() - - - 137 - 205 - - - 1332 - 731 + 1328 + 605 @@ -1120,22 +1329,6 @@ - - pushButton_13 - clicked() - CheckWindow - showCheck() - - - 1095 - 571 - - - 1328 - 605 - - - showMethod() diff --git a/softwareDirectory/AutoVerScheme/AutoVerScheme.pro.user b/softwareDirectory/AutoVerScheme/AutoVerScheme.pro.user index a7c95f9..73103be 100644 --- a/softwareDirectory/AutoVerScheme/AutoVerScheme.pro.user +++ b/softwareDirectory/AutoVerScheme/AutoVerScheme.pro.user @@ -1,6 +1,6 @@ - + EnvironmentId diff --git a/softwareDirectory/AutoVerScheme/checkwindow.cpp b/softwareDirectory/AutoVerScheme/checkwindow.cpp index da86ad4..2f3e8c6 100644 --- a/softwareDirectory/AutoVerScheme/checkwindow.cpp +++ b/softwareDirectory/AutoVerScheme/checkwindow.cpp @@ -36,13 +36,90 @@ void CheckWindow::showMethod() { - ui->stackedWidget->setCurrentIndex(1); - getCheckMethod(); + QString ids; + for(int i=0;itableWidgetDevice->rowCount();i++){ + Qt::CheckState state = ui->tableWidgetDevice->item(i,0)->checkState(); + if(state == Qt::Checked){ + if(ids=="") + ids = myTaskList[i].id; + else + ids +=";"+ myTaskList[i].id; + //break; + } + } + if(ids==""){ + QMessageBox::warning(this, "提示", "请选择被检设备！"); + }else{ + qDebug() << "select ids:" << ids; + ui->stackedWidget->setCurrentIndex(1); + getCheckMethod(); + } } void CheckWindow::showDevice() { - ui->stackedWidget->setCurrentIndex(2); + QString sId=""; + for(int i=0;itableWidgetMethod->rowCount();i++){ + Qt::CheckState state = ui->tableWidgetMethod->item(i,0)->checkState(); + if(state == Qt::Checked){ + sId = programList[i].id; + break; + } + } + if(sId==""){ + QMessageBox::warning(this, "提示", "请选择检定程序！"); + }else{ + programInfo = BaseCommonApi::getVerificationProgramInfo(sId); + initDeviceInfo(); + ui->stackedWidget->setCurrentIndex(2); + } +} + +void CheckWindow::initDeviceInfo() +{ + QString strStyle = QString("QLabel{image:url(%1);}").arg(programInfo.img_path); + qDebug() << "strStyle:" << strStyle; + ui->label_8->setStyleSheet(strStyle); + + ui->tableWidget_3->clearContents(); + ui->tableWidget_3->setRowCount(0); + QStringList idList; + int rowCount=0; + int row=0; + if(programInfo.tested_device_id!="") + { + idList = programInfo.tested_device_id.split(","); + for(const QString& id : idList) + { + QList result = BaseCommonApi::getTestedCatDevice(id); + if(result.length()>0){ + rowCount = ui->tableWidget_3->rowCount(); + + ui->tableWidget_3->insertRow(rowCount); + ui->tableWidget_3->setItem(row, 0, new QTableWidgetItem(result[0].equipment_name)); + ui->tableWidget_3->setItem(row, 1, new QTableWidgetItem("成功")); //设置数据 + row++; + } + } + idList.clear(); + } + + if(programInfo.standard_device_id!=""){ + idList = programInfo.standard_device_id.split(","); + for(const QString& id : idList) + { + QList result = BaseCommonApi::getCatDeviceInfor(id); + if(result.length()>0){ + rowCount = ui->tableWidget_3->rowCount(); + + ui->tableWidget_3->insertRow(rowCount); + ui->tableWidget_3->setItem(row, 0, new QTableWidgetItem(result[0].equipment_name)); + ui->tableWidget_3->setItem(row, 1, new QTableWidgetItem("成功")); //设置数据 + row++; + } + } + idList.clear(); + } } void CheckWindow::showCheck() @@ -109,7 +186,8 @@ ui->tableWidgetMethod->insertRow(rowCount); QTableWidgetItem* p_check = new QTableWidgetItem(); - p_check->setCheckState(Qt::Unchecked); //设置首列为 CheckBox 控件 + //p_check->setCheckState(Qt::Checked); //设置首列为 CheckBox 控件 + p_check->setCheckState(Qt::Unchecked); ui->tableWidgetMethod->setItem(row,0,p_check); ui->tableWidgetMethod->setItem(row, 1, new QTableWidgetItem(program.program_name)); //设置数据 ui->tableWidgetMethod->setItem(row, 2, new QTableWidgetItem(program.create_name)); //设置数据 @@ -141,3 +219,27 @@ { } + +void CheckWindow::on_tableWidgetDevice_cellChanged(int row, int column) +{ + +} + +void CheckWindow::on_tableWidgetMethod_cellChanged(int row, int column) +{ + Qt::CheckState state = ui->tableWidgetMethod->item(row,0)->checkState(); + if(state == Qt::Checked) + { + for(int i=0;itableWidgetMethod->rowCount();i++){ + if(i!=row) + { + ui->tableWidgetMethod->item(i,0)->setCheckState(Qt::Unchecked); + } + } + } +} + +void CheckWindow::on_pushButton_9_clicked() +{ + showDevice(); +} diff --git a/softwareDirectory/AutoVerScheme/checkwindow.h b/softwareDirectory/AutoVerScheme/checkwindow.h index ea27646..d3fa0c3 100644 --- a/softwareDirectory/AutoVerScheme/checkwindow.h +++ b/softwareDirectory/AutoVerScheme/checkwindow.h @@ -22,13 +22,21 @@ void showMethodWidget(); void showResult(); void on_editButton_clicked(); + void on_tableWidgetDevice_cellChanged(int row, int column); + + void on_tableWidgetMethod_cellChanged(int row, int column); + + void on_pushButton_9_clicked(); + private: void getCheckDevice(); void getCheckMethod(); + void initDeviceInfo(); private: Ui::CheckWindow *ui; QList programList; QList myTaskList; + VerificationProgramInfo programInfo; }; #endif // CHECKWINDOW_H diff --git a/softwareDirectory/AutoVerScheme/checkwindow.ui b/softwareDirectory/AutoVerScheme/checkwindow.ui index 1f7ef8c..c486dcf 100644 --- a/softwareDirectory/AutoVerScheme/checkwindow.ui +++ b/softwareDirectory/AutoVerScheme/checkwindow.ui @@ -548,13 +548,7 @@ - - - - 0 - 0 - - + 120 @@ -812,6 +806,237 @@ 设备接口设置 + + + + + + 12 + + + + 串口 + + + + + + + + 12 + + + + 端口号: + + + + + + + + 12 + + + + true + + + + + + + + 12 + + + + 波特率: + + + + + + + + 12 + + + + true + + + 9600 + + + 1 + + + + 4800 + + + + + 9600 + + + + + 14400 + + + + + 19200 + + + + + 38400 + + + + + + + + + 12 + + + + 校验位: + + + + + + + + 12 + + + + + None + + + + + Odd + + + + + Even + + + + + + + + + 12 + + + + 数据位: + + + + + + + + 12 + + + + 1 + + + + 7 + + + + + 8 + + + + + + + + + 12 + + + + 停止位: + + + + + + + + 12 + + + + 1 + + + + None + + + + + One + + + + + Two + + + + + OnePointFive + + + + + + + + + 12 + + + + VISA + + + + + + + + 12 + + + + true + + + + @@ -1057,34 +1282,18 @@ - pushButton_12 + pushButton_13 clicked() CheckWindow - showMethod() + showCheck() - 137 - 205 + 1095 + 571 - 666 - 394 - - - - - pushButton_12 - clicked() - CheckWindow - showDevice() - - - 137 - 205 - - - 1332 - 731 + 1328 + 605 @@ -1120,22 +1329,6 @@ - - pushButton_13 - clicked() - CheckWindow - showCheck() - - - 1095 - 571 - - - 1328 - 605 - - - showMethod() diff --git a/softwareDirectory/AutoVerScheme/dialogcheckresult.cpp b/softwareDirectory/AutoVerScheme/dialogcheckresult.cpp index d961d6e..3a10cb0 100644 --- a/softwareDirectory/AutoVerScheme/dialogcheckresult.cpp +++ b/softwareDirectory/AutoVerScheme/dialogcheckresult.cpp @@ -14,3 +14,19 @@ { delete ui; } + +void DialogCheckResult::on_pushButton_3_clicked() +{ + SaveDeviceMeasureInfo measInfo; + BaseCommonApi::InsertSaveDeviceMeasureInfo(measInfo); +} + +void DialogCheckResult::on_pushButton_2_clicked() +{ + +} + +void DialogCheckResult::on_pushButton_clicked() +{ + +} diff --git a/softwareDirectory/AutoVerScheme/AutoVerScheme.pro.user b/softwareDirectory/AutoVerScheme/AutoVerScheme.pro.user index a7c95f9..73103be 100644 --- a/softwareDirectory/AutoVerScheme/AutoVerScheme.pro.user +++ b/softwareDirectory/AutoVerScheme/AutoVerScheme.pro.user @@ -1,6 +1,6 @@ - + EnvironmentId diff --git a/softwareDirectory/AutoVerScheme/checkwindow.cpp b/softwareDirectory/AutoVerScheme/checkwindow.cpp index da86ad4..2f3e8c6 100644 --- a/softwareDirectory/AutoVerScheme/checkwindow.cpp +++ b/softwareDirectory/AutoVerScheme/checkwindow.cpp @@ -36,13 +36,90 @@ void CheckWindow::showMethod() { - ui->stackedWidget->setCurrentIndex(1); - getCheckMethod(); + QString ids; + for(int i=0;itableWidgetDevice->rowCount();i++){ + Qt::CheckState state = ui->tableWidgetDevice->item(i,0)->checkState(); + if(state == Qt::Checked){ + if(ids=="") + ids = myTaskList[i].id; + else + ids +=";"+ myTaskList[i].id; + //break; + } + } + if(ids==""){ + QMessageBox::warning(this, "提示", "请选择被检设备！"); + }else{ + qDebug() << "select ids:" << ids; + ui->stackedWidget->setCurrentIndex(1); + getCheckMethod(); + } } void CheckWindow::showDevice() { - ui->stackedWidget->setCurrentIndex(2); + QString sId=""; + for(int i=0;itableWidgetMethod->rowCount();i++){ + Qt::CheckState state = ui->tableWidgetMethod->item(i,0)->checkState(); + if(state == Qt::Checked){ + sId = programList[i].id; + break; + } + } + if(sId==""){ + QMessageBox::warning(this, "提示", "请选择检定程序！"); + }else{ + programInfo = BaseCommonApi::getVerificationProgramInfo(sId); + initDeviceInfo(); + ui->stackedWidget->setCurrentIndex(2); + } +} + +void CheckWindow::initDeviceInfo() +{ + QString strStyle = QString("QLabel{image:url(%1);}").arg(programInfo.img_path); + qDebug() << "strStyle:" << strStyle; + ui->label_8->setStyleSheet(strStyle); + + ui->tableWidget_3->clearContents(); + ui->tableWidget_3->setRowCount(0); + QStringList idList; + int rowCount=0; + int row=0; + if(programInfo.tested_device_id!="") + { + idList = programInfo.tested_device_id.split(","); + for(const QString& id : idList) + { + QList result = BaseCommonApi::getTestedCatDevice(id); + if(result.length()>0){ + rowCount = ui->tableWidget_3->rowCount(); + + ui->tableWidget_3->insertRow(rowCount); + ui->tableWidget_3->setItem(row, 0, new QTableWidgetItem(result[0].equipment_name)); + ui->tableWidget_3->setItem(row, 1, new QTableWidgetItem("成功")); //设置数据 + row++; + } + } + idList.clear(); + } + + if(programInfo.standard_device_id!=""){ + idList = programInfo.standard_device_id.split(","); + for(const QString& id : idList) + { + QList result = BaseCommonApi::getCatDeviceInfor(id); + if(result.length()>0){ + rowCount = ui->tableWidget_3->rowCount(); + + ui->tableWidget_3->insertRow(rowCount); + ui->tableWidget_3->setItem(row, 0, new QTableWidgetItem(result[0].equipment_name)); + ui->tableWidget_3->setItem(row, 1, new QTableWidgetItem("成功")); //设置数据 + row++; + } + } + idList.clear(); + } } void CheckWindow::showCheck() @@ -109,7 +186,8 @@ ui->tableWidgetMethod->insertRow(rowCount); QTableWidgetItem* p_check = new QTableWidgetItem(); - p_check->setCheckState(Qt::Unchecked); //设置首列为 CheckBox 控件 + //p_check->setCheckState(Qt::Checked); //设置首列为 CheckBox 控件 + p_check->setCheckState(Qt::Unchecked); ui->tableWidgetMethod->setItem(row,0,p_check); ui->tableWidgetMethod->setItem(row, 1, new QTableWidgetItem(program.program_name)); //设置数据 ui->tableWidgetMethod->setItem(row, 2, new QTableWidgetItem(program.create_name)); //设置数据 @@ -141,3 +219,27 @@ { } + +void CheckWindow::on_tableWidgetDevice_cellChanged(int row, int column) +{ + +} + +void CheckWindow::on_tableWidgetMethod_cellChanged(int row, int column) +{ + Qt::CheckState state = ui->tableWidgetMethod->item(row,0)->checkState(); + if(state == Qt::Checked) + { + for(int i=0;itableWidgetMethod->rowCount();i++){ + if(i!=row) + { + ui->tableWidgetMethod->item(i,0)->setCheckState(Qt::Unchecked); + } + } + } +} + +void CheckWindow::on_pushButton_9_clicked() +{ + showDevice(); +} diff --git a/softwareDirectory/AutoVerScheme/checkwindow.h b/softwareDirectory/AutoVerScheme/checkwindow.h index ea27646..d3fa0c3 100644 --- a/softwareDirectory/AutoVerScheme/checkwindow.h +++ b/softwareDirectory/AutoVerScheme/checkwindow.h @@ -22,13 +22,21 @@ void showMethodWidget(); void showResult(); void on_editButton_clicked(); + void on_tableWidgetDevice_cellChanged(int row, int column); + + void on_tableWidgetMethod_cellChanged(int row, int column); + + void on_pushButton_9_clicked(); + private: void getCheckDevice(); void getCheckMethod(); + void initDeviceInfo(); private: Ui::CheckWindow *ui; QList programList; QList myTaskList; + VerificationProgramInfo programInfo; }; #endif // CHECKWINDOW_H diff --git a/softwareDirectory/AutoVerScheme/checkwindow.ui b/softwareDirectory/AutoVerScheme/checkwindow.ui index 1f7ef8c..c486dcf 100644 --- a/softwareDirectory/AutoVerScheme/checkwindow.ui +++ b/softwareDirectory/AutoVerScheme/checkwindow.ui @@ -548,13 +548,7 @@ - - - - 0 - 0 - - + 120 @@ -812,6 +806,237 @@ 设备接口设置 + + + + + + 12 + + + + 串口 + + + + + + + + 12 + + + + 端口号: + + + + + + + + 12 + + + + true + + + + + + + + 12 + + + + 波特率: + + + + + + + + 12 + + + + true + + + 9600 + + + 1 + + + + 4800 + + + + + 9600 + + + + + 14400 + + + + + 19200 + + + + + 38400 + + + + + + + + + 12 + + + + 校验位: + + + + + + + + 12 + + + + + None + + + + + Odd + + + + + Even + + + + + + + + + 12 + + + + 数据位: + + + + + + + + 12 + + + + 1 + + + + 7 + + + + + 8 + + + + + + + + + 12 + + + + 停止位: + + + + + + + + 12 + + + + 1 + + + + None + + + + + One + + + + + Two + + + + + OnePointFive + + + + + + + + + 12 + + + + VISA + + + + + + + + 12 + + + + true + + + + @@ -1057,34 +1282,18 @@ - pushButton_12 + pushButton_13 clicked() CheckWindow - showMethod() + showCheck() - 137 - 205 + 1095 + 571 - 666 - 394 - - - - - pushButton_12 - clicked() - CheckWindow - showDevice() - - - 137 - 205 - - - 1332 - 731 + 1328 + 605 @@ -1120,22 +1329,6 @@ - - pushButton_13 - clicked() - CheckWindow - showCheck() - - - 1095 - 571 - - - 1328 - 605 - - - showMethod() diff --git a/softwareDirectory/AutoVerScheme/dialogcheckresult.cpp b/softwareDirectory/AutoVerScheme/dialogcheckresult.cpp index d961d6e..3a10cb0 100644 --- a/softwareDirectory/AutoVerScheme/dialogcheckresult.cpp +++ b/softwareDirectory/AutoVerScheme/dialogcheckresult.cpp @@ -14,3 +14,19 @@ { delete ui; } + +void DialogCheckResult::on_pushButton_3_clicked() +{ + SaveDeviceMeasureInfo measInfo; + BaseCommonApi::InsertSaveDeviceMeasureInfo(measInfo); +} + +void DialogCheckResult::on_pushButton_2_clicked() +{ + +} + +void DialogCheckResult::on_pushButton_clicked() +{ + +} diff --git a/softwareDirectory/AutoVerScheme/dialogcheckresult.h b/softwareDirectory/AutoVerScheme/dialogcheckresult.h index 164e727..aec3b88 100644 --- a/softwareDirectory/AutoVerScheme/dialogcheckresult.h +++ b/softwareDirectory/AutoVerScheme/dialogcheckresult.h @@ -2,6 +2,7 @@ #define DIALOGCHECKRESULT_H #include +#include "basecommonapi.h" namespace Ui { class DialogCheckResult; @@ -15,6 +16,13 @@ explicit DialogCheckResult(QWidget *parent = nullptr); ~DialogCheckResult(); +private slots: + void on_pushButton_3_clicked(); + + void on_pushButton_2_clicked(); + + void on_pushButton_clicked(); + private: Ui::DialogCheckResult *ui; }; diff --git a/softwareDirectory/AutoVerScheme/AutoVerScheme.pro.user b/softwareDirectory/AutoVerScheme/AutoVerScheme.pro.user index a7c95f9..73103be 100644 --- a/softwareDirectory/AutoVerScheme/AutoVerScheme.pro.user +++ b/softwareDirectory/AutoVerScheme/AutoVerScheme.pro.user @@ -1,6 +1,6 @@ - + EnvironmentId diff --git a/softwareDirectory/AutoVerScheme/checkwindow.cpp b/softwareDirectory/AutoVerScheme/checkwindow.cpp index da86ad4..2f3e8c6 100644 --- a/softwareDirectory/AutoVerScheme/checkwindow.cpp +++ b/softwareDirectory/AutoVerScheme/checkwindow.cpp @@ -36,13 +36,90 @@ void CheckWindow::showMethod() { - ui->stackedWidget->setCurrentIndex(1); - getCheckMethod(); + QString ids; + for(int i=0;itableWidgetDevice->rowCount();i++){ + Qt::CheckState state = ui->tableWidgetDevice->item(i,0)->checkState(); + if(state == Qt::Checked){ + if(ids=="") + ids = myTaskList[i].id; + else + ids +=";"+ myTaskList[i].id; + //break; + } + } + if(ids==""){ + QMessageBox::warning(this, "提示", "请选择被检设备！"); + }else{ + qDebug() << "select ids:" << ids; + ui->stackedWidget->setCurrentIndex(1); + getCheckMethod(); + } } void CheckWindow::showDevice() { - ui->stackedWidget->setCurrentIndex(2); + QString sId=""; + for(int i=0;itableWidgetMethod->rowCount();i++){ + Qt::CheckState state = ui->tableWidgetMethod->item(i,0)->checkState(); + if(state == Qt::Checked){ + sId = programList[i].id; + break; + } + } + if(sId==""){ + QMessageBox::warning(this, "提示", "请选择检定程序！"); + }else{ + programInfo = BaseCommonApi::getVerificationProgramInfo(sId); + initDeviceInfo(); + ui->stackedWidget->setCurrentIndex(2); + } +} + +void CheckWindow::initDeviceInfo() +{ + QString strStyle = QString("QLabel{image:url(%1);}").arg(programInfo.img_path); + qDebug() << "strStyle:" << strStyle; + ui->label_8->setStyleSheet(strStyle); + + ui->tableWidget_3->clearContents(); + ui->tableWidget_3->setRowCount(0); + QStringList idList; + int rowCount=0; + int row=0; + if(programInfo.tested_device_id!="") + { + idList = programInfo.tested_device_id.split(","); + for(const QString& id : idList) + { + QList result = BaseCommonApi::getTestedCatDevice(id); + if(result.length()>0){ + rowCount = ui->tableWidget_3->rowCount(); + + ui->tableWidget_3->insertRow(rowCount); + ui->tableWidget_3->setItem(row, 0, new QTableWidgetItem(result[0].equipment_name)); + ui->tableWidget_3->setItem(row, 1, new QTableWidgetItem("成功")); //设置数据 + row++; + } + } + idList.clear(); + } + + if(programInfo.standard_device_id!=""){ + idList = programInfo.standard_device_id.split(","); + for(const QString& id : idList) + { + QList result = BaseCommonApi::getCatDeviceInfor(id); + if(result.length()>0){ + rowCount = ui->tableWidget_3->rowCount(); + + ui->tableWidget_3->insertRow(rowCount); + ui->tableWidget_3->setItem(row, 0, new QTableWidgetItem(result[0].equipment_name)); + ui->tableWidget_3->setItem(row, 1, new QTableWidgetItem("成功")); //设置数据 + row++; + } + } + idList.clear(); + } } void CheckWindow::showCheck() @@ -109,7 +186,8 @@ ui->tableWidgetMethod->insertRow(rowCount); QTableWidgetItem* p_check = new QTableWidgetItem(); - p_check->setCheckState(Qt::Unchecked); //设置首列为 CheckBox 控件 + //p_check->setCheckState(Qt::Checked); //设置首列为 CheckBox 控件 + p_check->setCheckState(Qt::Unchecked); ui->tableWidgetMethod->setItem(row,0,p_check); ui->tableWidgetMethod->setItem(row, 1, new QTableWidgetItem(program.program_name)); //设置数据 ui->tableWidgetMethod->setItem(row, 2, new QTableWidgetItem(program.create_name)); //设置数据 @@ -141,3 +219,27 @@ { } + +void CheckWindow::on_tableWidgetDevice_cellChanged(int row, int column) +{ + +} + +void CheckWindow::on_tableWidgetMethod_cellChanged(int row, int column) +{ + Qt::CheckState state = ui->tableWidgetMethod->item(row,0)->checkState(); + if(state == Qt::Checked) + { + for(int i=0;itableWidgetMethod->rowCount();i++){ + if(i!=row) + { + ui->tableWidgetMethod->item(i,0)->setCheckState(Qt::Unchecked); + } + } + } +} + +void CheckWindow::on_pushButton_9_clicked() +{ + showDevice(); +} diff --git a/softwareDirectory/AutoVerScheme/checkwindow.h b/softwareDirectory/AutoVerScheme/checkwindow.h index ea27646..d3fa0c3 100644 --- a/softwareDirectory/AutoVerScheme/checkwindow.h +++ b/softwareDirectory/AutoVerScheme/checkwindow.h @@ -22,13 +22,21 @@ void showMethodWidget(); void showResult(); void on_editButton_clicked(); + void on_tableWidgetDevice_cellChanged(int row, int column); + + void on_tableWidgetMethod_cellChanged(int row, int column); + + void on_pushButton_9_clicked(); + private: void getCheckDevice(); void getCheckMethod(); + void initDeviceInfo(); private: Ui::CheckWindow *ui; QList programList; QList myTaskList; + VerificationProgramInfo programInfo; }; #endif // CHECKWINDOW_H diff --git a/softwareDirectory/AutoVerScheme/checkwindow.ui b/softwareDirectory/AutoVerScheme/checkwindow.ui index 1f7ef8c..c486dcf 100644 --- a/softwareDirectory/AutoVerScheme/checkwindow.ui +++ b/softwareDirectory/AutoVerScheme/checkwindow.ui @@ -548,13 +548,7 @@ - - - - 0 - 0 - - + 120 @@ -812,6 +806,237 @@ 设备接口设置 + + + + + + 12 + + + + 串口 + + + + + + + + 12 + + + + 端口号: + + + + + + + + 12 + + + + true + + + + + + + + 12 + + + + 波特率: + + + + + + + + 12 + + + + true + + + 9600 + + + 1 + + + + 4800 + + + + + 9600 + + + + + 14400 + + + + + 19200 + + + + + 38400 + + + + + + + + + 12 + + + + 校验位: + + + + + + + + 12 + + + + + None + + + + + Odd + + + + + Even + + + + + + + + + 12 + + + + 数据位: + + + + + + + + 12 + + + + 1 + + + + 7 + + + + + 8 + + + + + + + + + 12 + + + + 停止位: + + + + + + + + 12 + + + + 1 + + + + None + + + + + One + + + + + Two + + + + + OnePointFive + + + + + + + + + 12 + + + + VISA + + + + + + + + 12 + + + + true + + + + @@ -1057,34 +1282,18 @@ - pushButton_12 + pushButton_13 clicked() CheckWindow - showMethod() + showCheck() - 137 - 205 + 1095 + 571 - 666 - 394 - - - - - pushButton_12 - clicked() - CheckWindow - showDevice() - - - 137 - 205 - - - 1332 - 731 + 1328 + 605 @@ -1120,22 +1329,6 @@ - - pushButton_13 - clicked() - CheckWindow - showCheck() - - - 1095 - 571 - - - 1328 - 605 - - - showMethod() diff --git a/softwareDirectory/AutoVerScheme/dialogcheckresult.cpp b/softwareDirectory/AutoVerScheme/dialogcheckresult.cpp index d961d6e..3a10cb0 100644 --- a/softwareDirectory/AutoVerScheme/dialogcheckresult.cpp +++ b/softwareDirectory/AutoVerScheme/dialogcheckresult.cpp @@ -14,3 +14,19 @@ { delete ui; } + +void DialogCheckResult::on_pushButton_3_clicked() +{ + SaveDeviceMeasureInfo measInfo; + BaseCommonApi::InsertSaveDeviceMeasureInfo(measInfo); +} + +void DialogCheckResult::on_pushButton_2_clicked() +{ + +} + +void DialogCheckResult::on_pushButton_clicked() +{ + +} diff --git a/softwareDirectory/AutoVerScheme/dialogcheckresult.h b/softwareDirectory/AutoVerScheme/dialogcheckresult.h index 164e727..aec3b88 100644 --- a/softwareDirectory/AutoVerScheme/dialogcheckresult.h +++ b/softwareDirectory/AutoVerScheme/dialogcheckresult.h @@ -2,6 +2,7 @@ #define DIALOGCHECKRESULT_H #include +#include "basecommonapi.h" namespace Ui { class DialogCheckResult; @@ -15,6 +16,13 @@ explicit DialogCheckResult(QWidget *parent = nullptr); ~DialogCheckResult(); +private slots: + void on_pushButton_3_clicked(); + + void on_pushButton_2_clicked(); + + void on_pushButton_clicked(); + private: Ui::DialogCheckResult *ui; }; diff --git a/softwareDirectory/AutoVerScheme/formverypoint.cpp b/softwareDirectory/AutoVerScheme/formverypoint.cpp index bff9f7f..44698b7 100644 --- a/softwareDirectory/AutoVerScheme/formverypoint.cpp +++ b/softwareDirectory/AutoVerScheme/formverypoint.cpp @@ -24,7 +24,8 @@ //获取核查点tablewight的数据 QStringList headlist; //QString DeviceName = BaseCommonApi::getApparatus(id); - QList bizDeviceManageData=BaseCommonApi::getCheckDCPower(id,&headlist); + //QList bizDeviceManageData=BaseCommonApi::getCheckDCPower(id,&headlist); + QList ptList = BaseCommonApi::getVerificationItemsMultiList(id,&headlist); //QList bizDeviceManageData = BaseCommonApi::getCheckDCPower(id); //设置tablewight ui->tableWidget->setRowCount(0); @@ -39,11 +40,11 @@ int rowCount=0; int row=0; - for (const CheckDCPower& checkDCPower : bizDeviceManageData) + for (const QStringList& item : ptList) { rowCount = ui->tableWidget->rowCount(); ui->tableWidget->insertRow(rowCount); - ui->tableWidget->setItem(row, 0, new QTableWidgetItem(QString::number(row+1))); + /*ui->tableWidget->setItem(row, 0, new QTableWidgetItem(QString::number(row+1))); ui->tableWidget->setItem(row, 1, new QTableWidgetItem(checkDCPower.check_type)); //核查类型 ui->tableWidget->setItem(row, 2, new QTableWidgetItem(checkDCPower.params)); //参数 ui->tableWidget->setItem(row, 3, new QTableWidgetItem(checkDCPower.unit)); //单位 @@ -52,10 +53,15 @@ ui->tableWidget->setItem(row, 6, new QTableWidgetItem(checkDCPower.cycle_number));//循环次数 ui->tableWidget->setItem(row, 7, new QTableWidgetItem(checkDCPower.urel));//urel ui->tableWidget->setItem(row, 8, new QTableWidgetItem(checkDCPower.resistance_value));//电阻值 - ui->tableWidget->setItem(row, 9, new QTableWidgetItem(checkDCPower.resistance_value_unit));//电阻值单位 + ui->tableWidget->setItem(row, 9, new QTableWidgetItem(checkDCPower.resistance_value_unit));//电阻值单位*/ //ui->tableWidget->setItem(row, 0, new QTableWidgetItem(dept.id)); //QDebug + //循环读取值 headlist，count是列的数量 + for(int i=0;itableWidget->setItem(row, i, new QTableWidgetItem(item[i])); + } row++; } diff --git a/softwareDirectory/AutoVerScheme/AutoVerScheme.pro.user b/softwareDirectory/AutoVerScheme/AutoVerScheme.pro.user index a7c95f9..73103be 100644 --- a/softwareDirectory/AutoVerScheme/AutoVerScheme.pro.user +++ b/softwareDirectory/AutoVerScheme/AutoVerScheme.pro.user @@ -1,6 +1,6 @@ - + EnvironmentId diff --git a/softwareDirectory/AutoVerScheme/checkwindow.cpp b/softwareDirectory/AutoVerScheme/checkwindow.cpp index da86ad4..2f3e8c6 100644 --- a/softwareDirectory/AutoVerScheme/checkwindow.cpp +++ b/softwareDirectory/AutoVerScheme/checkwindow.cpp @@ -36,13 +36,90 @@ void CheckWindow::showMethod() { - ui->stackedWidget->setCurrentIndex(1); - getCheckMethod(); + QString ids; + for(int i=0;itableWidgetDevice->rowCount();i++){ + Qt::CheckState state = ui->tableWidgetDevice->item(i,0)->checkState(); + if(state == Qt::Checked){ + if(ids=="") + ids = myTaskList[i].id; + else + ids +=";"+ myTaskList[i].id; + //break; + } + } + if(ids==""){ + QMessageBox::warning(this, "提示", "请选择被检设备！"); + }else{ + qDebug() << "select ids:" << ids; + ui->stackedWidget->setCurrentIndex(1); + getCheckMethod(); + } } void CheckWindow::showDevice() { - ui->stackedWidget->setCurrentIndex(2); + QString sId=""; + for(int i=0;itableWidgetMethod->rowCount();i++){ + Qt::CheckState state = ui->tableWidgetMethod->item(i,0)->checkState(); + if(state == Qt::Checked){ + sId = programList[i].id; + break; + } + } + if(sId==""){ + QMessageBox::warning(this, "提示", "请选择检定程序！"); + }else{ + programInfo = BaseCommonApi::getVerificationProgramInfo(sId); + initDeviceInfo(); + ui->stackedWidget->setCurrentIndex(2); + } +} + +void CheckWindow::initDeviceInfo() +{ + QString strStyle = QString("QLabel{image:url(%1);}").arg(programInfo.img_path); + qDebug() << "strStyle:" << strStyle; + ui->label_8->setStyleSheet(strStyle); + + ui->tableWidget_3->clearContents(); + ui->tableWidget_3->setRowCount(0); + QStringList idList; + int rowCount=0; + int row=0; + if(programInfo.tested_device_id!="") + { + idList = programInfo.tested_device_id.split(","); + for(const QString& id : idList) + { + QList result = BaseCommonApi::getTestedCatDevice(id); + if(result.length()>0){ + rowCount = ui->tableWidget_3->rowCount(); + + ui->tableWidget_3->insertRow(rowCount); + ui->tableWidget_3->setItem(row, 0, new QTableWidgetItem(result[0].equipment_name)); + ui->tableWidget_3->setItem(row, 1, new QTableWidgetItem("成功")); //设置数据 + row++; + } + } + idList.clear(); + } + + if(programInfo.standard_device_id!=""){ + idList = programInfo.standard_device_id.split(","); + for(const QString& id : idList) + { + QList result = BaseCommonApi::getCatDeviceInfor(id); + if(result.length()>0){ + rowCount = ui->tableWidget_3->rowCount(); + + ui->tableWidget_3->insertRow(rowCount); + ui->tableWidget_3->setItem(row, 0, new QTableWidgetItem(result[0].equipment_name)); + ui->tableWidget_3->setItem(row, 1, new QTableWidgetItem("成功")); //设置数据 + row++; + } + } + idList.clear(); + } } void CheckWindow::showCheck() @@ -109,7 +186,8 @@ ui->tableWidgetMethod->insertRow(rowCount); QTableWidgetItem* p_check = new QTableWidgetItem(); - p_check->setCheckState(Qt::Unchecked); //设置首列为 CheckBox 控件 + //p_check->setCheckState(Qt::Checked); //设置首列为 CheckBox 控件 + p_check->setCheckState(Qt::Unchecked); ui->tableWidgetMethod->setItem(row,0,p_check); ui->tableWidgetMethod->setItem(row, 1, new QTableWidgetItem(program.program_name)); //设置数据 ui->tableWidgetMethod->setItem(row, 2, new QTableWidgetItem(program.create_name)); //设置数据 @@ -141,3 +219,27 @@ { } + +void CheckWindow::on_tableWidgetDevice_cellChanged(int row, int column) +{ + +} + +void CheckWindow::on_tableWidgetMethod_cellChanged(int row, int column) +{ + Qt::CheckState state = ui->tableWidgetMethod->item(row,0)->checkState(); + if(state == Qt::Checked) + { + for(int i=0;itableWidgetMethod->rowCount();i++){ + if(i!=row) + { + ui->tableWidgetMethod->item(i,0)->setCheckState(Qt::Unchecked); + } + } + } +} + +void CheckWindow::on_pushButton_9_clicked() +{ + showDevice(); +} diff --git a/softwareDirectory/AutoVerScheme/checkwindow.h b/softwareDirectory/AutoVerScheme/checkwindow.h index ea27646..d3fa0c3 100644 --- a/softwareDirectory/AutoVerScheme/checkwindow.h +++ b/softwareDirectory/AutoVerScheme/checkwindow.h @@ -22,13 +22,21 @@ void showMethodWidget(); void showResult(); void on_editButton_clicked(); + void on_tableWidgetDevice_cellChanged(int row, int column); + + void on_tableWidgetMethod_cellChanged(int row, int column); + + void on_pushButton_9_clicked(); + private: void getCheckDevice(); void getCheckMethod(); + void initDeviceInfo(); private: Ui::CheckWindow *ui; QList programList; QList myTaskList; + VerificationProgramInfo programInfo; }; #endif // CHECKWINDOW_H diff --git a/softwareDirectory/AutoVerScheme/checkwindow.ui b/softwareDirectory/AutoVerScheme/checkwindow.ui index 1f7ef8c..c486dcf 100644 --- a/softwareDirectory/AutoVerScheme/checkwindow.ui +++ b/softwareDirectory/AutoVerScheme/checkwindow.ui @@ -548,13 +548,7 @@ - - - - 0 - 0 - - + 120 @@ -812,6 +806,237 @@ 设备接口设置 + + + + + + 12 + + + + 串口 + + + + + + + + 12 + + + + 端口号: + + + + + + + + 12 + + + + true + + + + + + + + 12 + + + + 波特率: + + + + + + + + 12 + + + + true + + + 9600 + + + 1 + + + + 4800 + + + + + 9600 + + + + + 14400 + + + + + 19200 + + + + + 38400 + + + + + + + + + 12 + + + + 校验位: + + + + + + + + 12 + + + + + None + + + + + Odd + + + + + Even + + + + + + + + + 12 + + + + 数据位: + + + + + + + + 12 + + + + 1 + + + + 7 + + + + + 8 + + + + + + + + + 12 + + + + 停止位: + + + + + + + + 12 + + + + 1 + + + + None + + + + + One + + + + + Two + + + + + OnePointFive + + + + + + + + + 12 + + + + VISA + + + + + + + + 12 + + + + true + + + + @@ -1057,34 +1282,18 @@ - pushButton_12 + pushButton_13 clicked() CheckWindow - showMethod() + showCheck() - 137 - 205 + 1095 + 571 - 666 - 394 - - - - - pushButton_12 - clicked() - CheckWindow - showDevice() - - - 137 - 205 - - - 1332 - 731 + 1328 + 605 @@ -1120,22 +1329,6 @@ - - pushButton_13 - clicked() - CheckWindow - showCheck() - - - 1095 - 571 - - - 1328 - 605 - - - showMethod() diff --git a/softwareDirectory/AutoVerScheme/dialogcheckresult.cpp b/softwareDirectory/AutoVerScheme/dialogcheckresult.cpp index d961d6e..3a10cb0 100644 --- a/softwareDirectory/AutoVerScheme/dialogcheckresult.cpp +++ b/softwareDirectory/AutoVerScheme/dialogcheckresult.cpp @@ -14,3 +14,19 @@ { delete ui; } + +void DialogCheckResult::on_pushButton_3_clicked() +{ + SaveDeviceMeasureInfo measInfo; + BaseCommonApi::InsertSaveDeviceMeasureInfo(measInfo); +} + +void DialogCheckResult::on_pushButton_2_clicked() +{ + +} + +void DialogCheckResult::on_pushButton_clicked() +{ + +} diff --git a/softwareDirectory/AutoVerScheme/dialogcheckresult.h b/softwareDirectory/AutoVerScheme/dialogcheckresult.h index 164e727..aec3b88 100644 --- a/softwareDirectory/AutoVerScheme/dialogcheckresult.h +++ b/softwareDirectory/AutoVerScheme/dialogcheckresult.h @@ -2,6 +2,7 @@ #define DIALOGCHECKRESULT_H #include +#include "basecommonapi.h" namespace Ui { class DialogCheckResult; @@ -15,6 +16,13 @@ explicit DialogCheckResult(QWidget *parent = nullptr); ~DialogCheckResult(); +private slots: + void on_pushButton_3_clicked(); + + void on_pushButton_2_clicked(); + + void on_pushButton_clicked(); + private: Ui::DialogCheckResult *ui; }; diff --git a/softwareDirectory/AutoVerScheme/formverypoint.cpp b/softwareDirectory/AutoVerScheme/formverypoint.cpp index bff9f7f..44698b7 100644 --- a/softwareDirectory/AutoVerScheme/formverypoint.cpp +++ b/softwareDirectory/AutoVerScheme/formverypoint.cpp @@ -24,7 +24,8 @@ //获取核查点tablewight的数据 QStringList headlist; //QString DeviceName = BaseCommonApi::getApparatus(id); - QList bizDeviceManageData=BaseCommonApi::getCheckDCPower(id,&headlist); + //QList bizDeviceManageData=BaseCommonApi::getCheckDCPower(id,&headlist); + QList ptList = BaseCommonApi::getVerificationItemsMultiList(id,&headlist); //QList bizDeviceManageData = BaseCommonApi::getCheckDCPower(id); //设置tablewight ui->tableWidget->setRowCount(0); @@ -39,11 +40,11 @@ int rowCount=0; int row=0; - for (const CheckDCPower& checkDCPower : bizDeviceManageData) + for (const QStringList& item : ptList) { rowCount = ui->tableWidget->rowCount(); ui->tableWidget->insertRow(rowCount); - ui->tableWidget->setItem(row, 0, new QTableWidgetItem(QString::number(row+1))); + /*ui->tableWidget->setItem(row, 0, new QTableWidgetItem(QString::number(row+1))); ui->tableWidget->setItem(row, 1, new QTableWidgetItem(checkDCPower.check_type)); //核查类型 ui->tableWidget->setItem(row, 2, new QTableWidgetItem(checkDCPower.params)); //参数 ui->tableWidget->setItem(row, 3, new QTableWidgetItem(checkDCPower.unit)); //单位 @@ -52,10 +53,15 @@ ui->tableWidget->setItem(row, 6, new QTableWidgetItem(checkDCPower.cycle_number));//循环次数 ui->tableWidget->setItem(row, 7, new QTableWidgetItem(checkDCPower.urel));//urel ui->tableWidget->setItem(row, 8, new QTableWidgetItem(checkDCPower.resistance_value));//电阻值 - ui->tableWidget->setItem(row, 9, new QTableWidgetItem(checkDCPower.resistance_value_unit));//电阻值单位 + ui->tableWidget->setItem(row, 9, new QTableWidgetItem(checkDCPower.resistance_value_unit));//电阻值单位*/ //ui->tableWidget->setItem(row, 0, new QTableWidgetItem(dept.id)); //QDebug + //循环读取值 headlist，count是列的数量 + for(int i=0;itableWidget->setItem(row, i, new QTableWidgetItem(item[i])); + } row++; } diff --git a/softwareDirectory/AutoVerScheme/formverypoint.cpp.autosave b/softwareDirectory/AutoVerScheme/formverypoint.cpp.autosave new file mode 100644 index 0000000..c507e81 --- /dev/null +++ b/softwareDirectory/AutoVerScheme/formverypoint.cpp.autosave @@ -0,0 +1,72 @@ +#include "formverypoint.h" +#include "ui_formverypoint.h" +#include "basecommonapi.h" + +FormVeryPoint::FormVeryPoint(QWidget *parent,QString sId) : + QWidget(parent), + checkId(sId), + ui(new Ui::FormVeryPoint) +{ + ui->setupUi(this); + if(checkId!="") + { + updateTable(checkId); + } +} + +FormVeryPoint::~FormVeryPoint() +{ + delete ui; +} + +void FormVeryPoint::updateTable(QString id) +{ + //获取核查点tablewight的数据 + QStringList headlist; + //QString DeviceName = BaseCommonApi::getApparatus(id); + //QList bizDeviceManageData=BaseCommonApi::getCheckDCPower(id,&headlist); + QList ptList = BaseCommonApi::Search_VerifyTable(id,&headlist); + //QList bizDeviceManageData = BaseCommonApi::getCheckDCPower(id); + //设置tablewight + ui->tableWidget->setRowCount(0); + ui->tableWidget->setColumnCount(headlist.count()); + ui->tableWidget->setHorizontalHeaderLabels(headlist); + ui->tableWidget->verticalHeader()->setParent(nullptr); //隐藏行头 + for(int i=0;itableWidget->horizontalHeader()->setSectionResizeMode(i,QHeaderView::Stretch); + } + //循环数据 + int rowCount=0; + int row=0; + + for (const QStringList& item : ptList) + { + rowCount = ui->tableWidget->rowCount(); + ui->tableWidget->insertRow(rowCount); + /*ui->tableWidget->setItem(row, 0, new QTableWidgetItem(QString::number(row+1))); + ui->tableWidget->setItem(row, 1, new QTableWidgetItem(checkDCPower.check_type)); //核查类型 + ui->tableWidget->setItem(row, 2, new QTableWidgetItem(checkDCPower.params)); //参数 + ui->tableWidget->setItem(row, 3, new QTableWidgetItem(checkDCPower.unit)); //单位 + ui->tableWidget->setItem(row, 4, new QTableWidgetItem(checkDCPower.datum_point));//基准点 + ui->tableWidget->setItem(row, 5, new QTableWidgetItem(checkDCPower.resolution));//分辨力 + ui->tableWidget->setItem(row, 6, new QTableWidgetItem(checkDCPower.cycle_number));//循环次数 + ui->tableWidget->setItem(row, 7, new QTableWidgetItem(checkDCPower.urel));//urel + ui->tableWidget->setItem(row, 8, new QTableWidgetItem(checkDCPower.resistance_value));//电阻值 + ui->tableWidget->setItem(row, 9, new QTableWidgetItem(checkDCPower.resistance_value_unit));//电阻值单位*/ + //ui->tableWidget->setItem(row, 0, new QTableWidgetItem(dept.id)); + + //QDebug + //循环读取值 headlist，count是列的数量 + for(int i=0;itableWidget->setItem(row, i, new QTableWidgetItem(item[i])); + } + row++; + + } +} +void FormVeryPoint::on_pushButton_14_clicked() +{ + this->close(); +} diff --git a/softwareDirectory/AutoVerScheme/AutoVerScheme.pro.user b/softwareDirectory/AutoVerScheme/AutoVerScheme.pro.user index a7c95f9..73103be 100644 --- a/softwareDirectory/AutoVerScheme/AutoVerScheme.pro.user +++ b/softwareDirectory/AutoVerScheme/AutoVerScheme.pro.user @@ -1,6 +1,6 @@ - + EnvironmentId diff --git a/softwareDirectory/AutoVerScheme/checkwindow.cpp b/softwareDirectory/AutoVerScheme/checkwindow.cpp index da86ad4..2f3e8c6 100644 --- a/softwareDirectory/AutoVerScheme/checkwindow.cpp +++ b/softwareDirectory/AutoVerScheme/checkwindow.cpp @@ -36,13 +36,90 @@ void CheckWindow::showMethod() { - ui->stackedWidget->setCurrentIndex(1); - getCheckMethod(); + QString ids; + for(int i=0;itableWidgetDevice->rowCount();i++){ + Qt::CheckState state = ui->tableWidgetDevice->item(i,0)->checkState(); + if(state == Qt::Checked){ + if(ids=="") + ids = myTaskList[i].id; + else + ids +=";"+ myTaskList[i].id; + //break; + } + } + if(ids==""){ + QMessageBox::warning(this, "提示", "请选择被检设备！"); + }else{ + qDebug() << "select ids:" << ids; + ui->stackedWidget->setCurrentIndex(1); + getCheckMethod(); + } } void CheckWindow::showDevice() { - ui->stackedWidget->setCurrentIndex(2); + QString sId=""; + for(int i=0;itableWidgetMethod->rowCount();i++){ + Qt::CheckState state = ui->tableWidgetMethod->item(i,0)->checkState(); + if(state == Qt::Checked){ + sId = programList[i].id; + break; + } + } + if(sId==""){ + QMessageBox::warning(this, "提示", "请选择检定程序！"); + }else{ + programInfo = BaseCommonApi::getVerificationProgramInfo(sId); + initDeviceInfo(); + ui->stackedWidget->setCurrentIndex(2); + } +} + +void CheckWindow::initDeviceInfo() +{ + QString strStyle = QString("QLabel{image:url(%1);}").arg(programInfo.img_path); + qDebug() << "strStyle:" << strStyle; + ui->label_8->setStyleSheet(strStyle); + + ui->tableWidget_3->clearContents(); + ui->tableWidget_3->setRowCount(0); + QStringList idList; + int rowCount=0; + int row=0; + if(programInfo.tested_device_id!="") + { + idList = programInfo.tested_device_id.split(","); + for(const QString& id : idList) + { + QList result = BaseCommonApi::getTestedCatDevice(id); + if(result.length()>0){ + rowCount = ui->tableWidget_3->rowCount(); + + ui->tableWidget_3->insertRow(rowCount); + ui->tableWidget_3->setItem(row, 0, new QTableWidgetItem(result[0].equipment_name)); + ui->tableWidget_3->setItem(row, 1, new QTableWidgetItem("成功")); //设置数据 + row++; + } + } + idList.clear(); + } + + if(programInfo.standard_device_id!=""){ + idList = programInfo.standard_device_id.split(","); + for(const QString& id : idList) + { + QList result = BaseCommonApi::getCatDeviceInfor(id); + if(result.length()>0){ + rowCount = ui->tableWidget_3->rowCount(); + + ui->tableWidget_3->insertRow(rowCount); + ui->tableWidget_3->setItem(row, 0, new QTableWidgetItem(result[0].equipment_name)); + ui->tableWidget_3->setItem(row, 1, new QTableWidgetItem("成功")); //设置数据 + row++; + } + } + idList.clear(); + } } void CheckWindow::showCheck() @@ -109,7 +186,8 @@ ui->tableWidgetMethod->insertRow(rowCount); QTableWidgetItem* p_check = new QTableWidgetItem(); - p_check->setCheckState(Qt::Unchecked); //设置首列为 CheckBox 控件 + //p_check->setCheckState(Qt::Checked); //设置首列为 CheckBox 控件 + p_check->setCheckState(Qt::Unchecked); ui->tableWidgetMethod->setItem(row,0,p_check); ui->tableWidgetMethod->setItem(row, 1, new QTableWidgetItem(program.program_name)); //设置数据 ui->tableWidgetMethod->setItem(row, 2, new QTableWidgetItem(program.create_name)); //设置数据 @@ -141,3 +219,27 @@ { } + +void CheckWindow::on_tableWidgetDevice_cellChanged(int row, int column) +{ + +} + +void CheckWindow::on_tableWidgetMethod_cellChanged(int row, int column) +{ + Qt::CheckState state = ui->tableWidgetMethod->item(row,0)->checkState(); + if(state == Qt::Checked) + { + for(int i=0;itableWidgetMethod->rowCount();i++){ + if(i!=row) + { + ui->tableWidgetMethod->item(i,0)->setCheckState(Qt::Unchecked); + } + } + } +} + +void CheckWindow::on_pushButton_9_clicked() +{ + showDevice(); +} diff --git a/softwareDirectory/AutoVerScheme/checkwindow.h b/softwareDirectory/AutoVerScheme/checkwindow.h index ea27646..d3fa0c3 100644 --- a/softwareDirectory/AutoVerScheme/checkwindow.h +++ b/softwareDirectory/AutoVerScheme/checkwindow.h @@ -22,13 +22,21 @@ void showMethodWidget(); void showResult(); void on_editButton_clicked(); + void on_tableWidgetDevice_cellChanged(int row, int column); + + void on_tableWidgetMethod_cellChanged(int row, int column); + + void on_pushButton_9_clicked(); + private: void getCheckDevice(); void getCheckMethod(); + void initDeviceInfo(); private: Ui::CheckWindow *ui; QList programList; QList myTaskList; + VerificationProgramInfo programInfo; }; #endif // CHECKWINDOW_H diff --git a/softwareDirectory/AutoVerScheme/checkwindow.ui b/softwareDirectory/AutoVerScheme/checkwindow.ui index 1f7ef8c..c486dcf 100644 --- a/softwareDirectory/AutoVerScheme/checkwindow.ui +++ b/softwareDirectory/AutoVerScheme/checkwindow.ui @@ -548,13 +548,7 @@ - - - - 0 - 0 - - + 120 @@ -812,6 +806,237 @@ 设备接口设置 + + + + + + 12 + + + + 串口 + + + + + + + + 12 + + + + 端口号: + + + + + + + + 12 + + + + true + + + + + + + + 12 + + + + 波特率: + + + + + + + + 12 + + + + true + + + 9600 + + + 1 + + + + 4800 + + + + + 9600 + + + + + 14400 + + + + + 19200 + + + + + 38400 + + + + + + + + + 12 + + + + 校验位: + + + + + + + + 12 + + + + + None + + + + + Odd + + + + + Even + + + + + + + + + 12 + + + + 数据位: + + + + + + + + 12 + + + + 1 + + + + 7 + + + + + 8 + + + + + + + + + 12 + + + + 停止位: + + + + + + + + 12 + + + + 1 + + + + None + + + + + One + + + + + Two + + + + + OnePointFive + + + + + + + + + 12 + + + + VISA + + + + + + + + 12 + + + + true + + + + @@ -1057,34 +1282,18 @@ - pushButton_12 + pushButton_13 clicked() CheckWindow - showMethod() + showCheck() - 137 - 205 + 1095 + 571 - 666 - 394 - - - - - pushButton_12 - clicked() - CheckWindow - showDevice() - - - 137 - 205 - - - 1332 - 731 + 1328 + 605 @@ -1120,22 +1329,6 @@ - - pushButton_13 - clicked() - CheckWindow - showCheck() - - - 1095 - 571 - - - 1328 - 605 - - - showMethod() diff --git a/softwareDirectory/AutoVerScheme/dialogcheckresult.cpp b/softwareDirectory/AutoVerScheme/dialogcheckresult.cpp index d961d6e..3a10cb0 100644 --- a/softwareDirectory/AutoVerScheme/dialogcheckresult.cpp +++ b/softwareDirectory/AutoVerScheme/dialogcheckresult.cpp @@ -14,3 +14,19 @@ { delete ui; } + +void DialogCheckResult::on_pushButton_3_clicked() +{ + SaveDeviceMeasureInfo measInfo; + BaseCommonApi::InsertSaveDeviceMeasureInfo(measInfo); +} + +void DialogCheckResult::on_pushButton_2_clicked() +{ + +} + +void DialogCheckResult::on_pushButton_clicked() +{ + +} diff --git a/softwareDirectory/AutoVerScheme/dialogcheckresult.h b/softwareDirectory/AutoVerScheme/dialogcheckresult.h index 164e727..aec3b88 100644 --- a/softwareDirectory/AutoVerScheme/dialogcheckresult.h +++ b/softwareDirectory/AutoVerScheme/dialogcheckresult.h @@ -2,6 +2,7 @@ #define DIALOGCHECKRESULT_H #include +#include "basecommonapi.h" namespace Ui { class DialogCheckResult; @@ -15,6 +16,13 @@ explicit DialogCheckResult(QWidget *parent = nullptr); ~DialogCheckResult(); +private slots: + void on_pushButton_3_clicked(); + + void on_pushButton_2_clicked(); + + void on_pushButton_clicked(); + private: Ui::DialogCheckResult *ui; }; diff --git a/softwareDirectory/AutoVerScheme/formverypoint.cpp b/softwareDirectory/AutoVerScheme/formverypoint.cpp index bff9f7f..44698b7 100644 --- a/softwareDirectory/AutoVerScheme/formverypoint.cpp +++ b/softwareDirectory/AutoVerScheme/formverypoint.cpp @@ -24,7 +24,8 @@ //获取核查点tablewight的数据 QStringList headlist; //QString DeviceName = BaseCommonApi::getApparatus(id); - QList bizDeviceManageData=BaseCommonApi::getCheckDCPower(id,&headlist); + //QList bizDeviceManageData=BaseCommonApi::getCheckDCPower(id,&headlist); + QList ptList = BaseCommonApi::getVerificationItemsMultiList(id,&headlist); //QList bizDeviceManageData = BaseCommonApi::getCheckDCPower(id); //设置tablewight ui->tableWidget->setRowCount(0); @@ -39,11 +40,11 @@ int rowCount=0; int row=0; - for (const CheckDCPower& checkDCPower : bizDeviceManageData) + for (const QStringList& item : ptList) { rowCount = ui->tableWidget->rowCount(); ui->tableWidget->insertRow(rowCount); - ui->tableWidget->setItem(row, 0, new QTableWidgetItem(QString::number(row+1))); + /*ui->tableWidget->setItem(row, 0, new QTableWidgetItem(QString::number(row+1))); ui->tableWidget->setItem(row, 1, new QTableWidgetItem(checkDCPower.check_type)); //核查类型 ui->tableWidget->setItem(row, 2, new QTableWidgetItem(checkDCPower.params)); //参数 ui->tableWidget->setItem(row, 3, new QTableWidgetItem(checkDCPower.unit)); //单位 @@ -52,10 +53,15 @@ ui->tableWidget->setItem(row, 6, new QTableWidgetItem(checkDCPower.cycle_number));//循环次数 ui->tableWidget->setItem(row, 7, new QTableWidgetItem(checkDCPower.urel));//urel ui->tableWidget->setItem(row, 8, new QTableWidgetItem(checkDCPower.resistance_value));//电阻值 - ui->tableWidget->setItem(row, 9, new QTableWidgetItem(checkDCPower.resistance_value_unit));//电阻值单位 + ui->tableWidget->setItem(row, 9, new QTableWidgetItem(checkDCPower.resistance_value_unit));//电阻值单位*/ //ui->tableWidget->setItem(row, 0, new QTableWidgetItem(dept.id)); //QDebug + //循环读取值 headlist，count是列的数量 + for(int i=0;itableWidget->setItem(row, i, new QTableWidgetItem(item[i])); + } row++; } diff --git a/softwareDirectory/AutoVerScheme/formverypoint.cpp.autosave b/softwareDirectory/AutoVerScheme/formverypoint.cpp.autosave new file mode 100644 index 0000000..c507e81 --- /dev/null +++ b/softwareDirectory/AutoVerScheme/formverypoint.cpp.autosave @@ -0,0 +1,72 @@ +#include "formverypoint.h" +#include "ui_formverypoint.h" +#include "basecommonapi.h" + +FormVeryPoint::FormVeryPoint(QWidget *parent,QString sId) : + QWidget(parent), + checkId(sId), + ui(new Ui::FormVeryPoint) +{ + ui->setupUi(this); + if(checkId!="") + { + updateTable(checkId); + } +} + +FormVeryPoint::~FormVeryPoint() +{ + delete ui; +} + +void FormVeryPoint::updateTable(QString id) +{ + //获取核查点tablewight的数据 + QStringList headlist; + //QString DeviceName = BaseCommonApi::getApparatus(id); + //QList bizDeviceManageData=BaseCommonApi::getCheckDCPower(id,&headlist); + QList ptList = BaseCommonApi::Search_VerifyTable(id,&headlist); + //QList bizDeviceManageData = BaseCommonApi::getCheckDCPower(id); + //设置tablewight + ui->tableWidget->setRowCount(0); + ui->tableWidget->setColumnCount(headlist.count()); + ui->tableWidget->setHorizontalHeaderLabels(headlist); + ui->tableWidget->verticalHeader()->setParent(nullptr); //隐藏行头 + for(int i=0;itableWidget->horizontalHeader()->setSectionResizeMode(i,QHeaderView::Stretch); + } + //循环数据 + int rowCount=0; + int row=0; + + for (const QStringList& item : ptList) + { + rowCount = ui->tableWidget->rowCount(); + ui->tableWidget->insertRow(rowCount); + /*ui->tableWidget->setItem(row, 0, new QTableWidgetItem(QString::number(row+1))); + ui->tableWidget->setItem(row, 1, new QTableWidgetItem(checkDCPower.check_type)); //核查类型 + ui->tableWidget->setItem(row, 2, new QTableWidgetItem(checkDCPower.params)); //参数 + ui->tableWidget->setItem(row, 3, new QTableWidgetItem(checkDCPower.unit)); //单位 + ui->tableWidget->setItem(row, 4, new QTableWidgetItem(checkDCPower.datum_point));//基准点 + ui->tableWidget->setItem(row, 5, new QTableWidgetItem(checkDCPower.resolution));//分辨力 + ui->tableWidget->setItem(row, 6, new QTableWidgetItem(checkDCPower.cycle_number));//循环次数 + ui->tableWidget->setItem(row, 7, new QTableWidgetItem(checkDCPower.urel));//urel + ui->tableWidget->setItem(row, 8, new QTableWidgetItem(checkDCPower.resistance_value));//电阻值 + ui->tableWidget->setItem(row, 9, new QTableWidgetItem(checkDCPower.resistance_value_unit));//电阻值单位*/ + //ui->tableWidget->setItem(row, 0, new QTableWidgetItem(dept.id)); + + //QDebug + //循环读取值 headlist，count是列的数量 + for(int i=0;itableWidget->setItem(row, i, new QTableWidgetItem(item[i])); + } + row++; + + } +} +void FormVeryPoint::on_pushButton_14_clicked() +{ + this->close(); +} diff --git a/softwareDirectory/AutoVerScheme/verifydevice.cpp b/softwareDirectory/AutoVerScheme/verifydevice.cpp index 0762d9f..591ac5d 100644 --- a/softwareDirectory/AutoVerScheme/verifydevice.cpp +++ b/softwareDirectory/AutoVerScheme/verifydevice.cpp @@ -30,8 +30,8 @@ { int rowCount=0; int row=0; - bizDeviceList = BaseCommonApi::getBizDeviceManage(); - for (const BizDevice& bizDevice : bizDeviceList) { + bizDeviceList = BaseCommonApi::getCheckDeviceList(); + for (const CheckAndTestedDevice& bizDevice : bizDeviceList) { rowCount = ui->tableWidget->rowCount(); ui->tableWidget->insertRow(rowCount); QTableWidgetItem* p_check = new QTableWidgetItem(); @@ -49,8 +49,8 @@ { int rowCount=0; int row=0; - testedDeviceList = BaseCommonApi::getTestedDevice(); - for (const TestedDevice& bizDevice : testedDeviceList) { + testedDeviceList = BaseCommonApi::getCheckAndTestedDeviceList(); + for (const CheckAndTestedDevice& bizDevice : testedDeviceList) { rowCount = ui->tableWidget_2->rowCount(); ui->tableWidget_2->insertRow(rowCount); QTableWidgetItem* p_check = new QTableWidgetItem(); diff --git a/softwareDirectory/AutoVerScheme/AutoVerScheme.pro.user b/softwareDirectory/AutoVerScheme/AutoVerScheme.pro.user index a7c95f9..73103be 100644 --- a/softwareDirectory/AutoVerScheme/AutoVerScheme.pro.user +++ b/softwareDirectory/AutoVerScheme/AutoVerScheme.pro.user @@ -1,6 +1,6 @@ - + EnvironmentId diff --git a/softwareDirectory/AutoVerScheme/checkwindow.cpp b/softwareDirectory/AutoVerScheme/checkwindow.cpp index da86ad4..2f3e8c6 100644 --- a/softwareDirectory/AutoVerScheme/checkwindow.cpp +++ b/softwareDirectory/AutoVerScheme/checkwindow.cpp @@ -36,13 +36,90 @@ void CheckWindow::showMethod() { - ui->stackedWidget->setCurrentIndex(1); - getCheckMethod(); + QString ids; + for(int i=0;itableWidgetDevice->rowCount();i++){ + Qt::CheckState state = ui->tableWidgetDevice->item(i,0)->checkState(); + if(state == Qt::Checked){ + if(ids=="") + ids = myTaskList[i].id; + else + ids +=";"+ myTaskList[i].id; + //break; + } + } + if(ids==""){ + QMessageBox::warning(this, "提示", "请选择被检设备！"); + }else{ + qDebug() << "select ids:" << ids; + ui->stackedWidget->setCurrentIndex(1); + getCheckMethod(); + } } void CheckWindow::showDevice() { - ui->stackedWidget->setCurrentIndex(2); + QString sId=""; + for(int i=0;itableWidgetMethod->rowCount();i++){ + Qt::CheckState state = ui->tableWidgetMethod->item(i,0)->checkState(); + if(state == Qt::Checked){ + sId = programList[i].id; + break; + } + } + if(sId==""){ + QMessageBox::warning(this, "提示", "请选择检定程序！"); + }else{ + programInfo = BaseCommonApi::getVerificationProgramInfo(sId); + initDeviceInfo(); + ui->stackedWidget->setCurrentIndex(2); + } +} + +void CheckWindow::initDeviceInfo() +{ + QString strStyle = QString("QLabel{image:url(%1);}").arg(programInfo.img_path); + qDebug() << "strStyle:" << strStyle; + ui->label_8->setStyleSheet(strStyle); + + ui->tableWidget_3->clearContents(); + ui->tableWidget_3->setRowCount(0); + QStringList idList; + int rowCount=0; + int row=0; + if(programInfo.tested_device_id!="") + { + idList = programInfo.tested_device_id.split(","); + for(const QString& id : idList) + { + QList result = BaseCommonApi::getTestedCatDevice(id); + if(result.length()>0){ + rowCount = ui->tableWidget_3->rowCount(); + + ui->tableWidget_3->insertRow(rowCount); + ui->tableWidget_3->setItem(row, 0, new QTableWidgetItem(result[0].equipment_name)); + ui->tableWidget_3->setItem(row, 1, new QTableWidgetItem("成功")); //设置数据 + row++; + } + } + idList.clear(); + } + + if(programInfo.standard_device_id!=""){ + idList = programInfo.standard_device_id.split(","); + for(const QString& id : idList) + { + QList result = BaseCommonApi::getCatDeviceInfor(id); + if(result.length()>0){ + rowCount = ui->tableWidget_3->rowCount(); + + ui->tableWidget_3->insertRow(rowCount); + ui->tableWidget_3->setItem(row, 0, new QTableWidgetItem(result[0].equipment_name)); + ui->tableWidget_3->setItem(row, 1, new QTableWidgetItem("成功")); //设置数据 + row++; + } + } + idList.clear(); + } } void CheckWindow::showCheck() @@ -109,7 +186,8 @@ ui->tableWidgetMethod->insertRow(rowCount); QTableWidgetItem* p_check = new QTableWidgetItem(); - p_check->setCheckState(Qt::Unchecked); //设置首列为 CheckBox 控件 + //p_check->setCheckState(Qt::Checked); //设置首列为 CheckBox 控件 + p_check->setCheckState(Qt::Unchecked); ui->tableWidgetMethod->setItem(row,0,p_check); ui->tableWidgetMethod->setItem(row, 1, new QTableWidgetItem(program.program_name)); //设置数据 ui->tableWidgetMethod->setItem(row, 2, new QTableWidgetItem(program.create_name)); //设置数据 @@ -141,3 +219,27 @@ { } + +void CheckWindow::on_tableWidgetDevice_cellChanged(int row, int column) +{ + +} + +void CheckWindow::on_tableWidgetMethod_cellChanged(int row, int column) +{ + Qt::CheckState state = ui->tableWidgetMethod->item(row,0)->checkState(); + if(state == Qt::Checked) + { + for(int i=0;itableWidgetMethod->rowCount();i++){ + if(i!=row) + { + ui->tableWidgetMethod->item(i,0)->setCheckState(Qt::Unchecked); + } + } + } +} + +void CheckWindow::on_pushButton_9_clicked() +{ + showDevice(); +} diff --git a/softwareDirectory/AutoVerScheme/checkwindow.h b/softwareDirectory/AutoVerScheme/checkwindow.h index ea27646..d3fa0c3 100644 --- a/softwareDirectory/AutoVerScheme/checkwindow.h +++ b/softwareDirectory/AutoVerScheme/checkwindow.h @@ -22,13 +22,21 @@ void showMethodWidget(); void showResult(); void on_editButton_clicked(); + void on_tableWidgetDevice_cellChanged(int row, int column); + + void on_tableWidgetMethod_cellChanged(int row, int column); + + void on_pushButton_9_clicked(); + private: void getCheckDevice(); void getCheckMethod(); + void initDeviceInfo(); private: Ui::CheckWindow *ui; QList programList; QList myTaskList; + VerificationProgramInfo programInfo; }; #endif // CHECKWINDOW_H diff --git a/softwareDirectory/AutoVerScheme/checkwindow.ui b/softwareDirectory/AutoVerScheme/checkwindow.ui index 1f7ef8c..c486dcf 100644 --- a/softwareDirectory/AutoVerScheme/checkwindow.ui +++ b/softwareDirectory/AutoVerScheme/checkwindow.ui @@ -548,13 +548,7 @@ - - - - 0 - 0 - - + 120 @@ -812,6 +806,237 @@ 设备接口设置 + + + + + + 12 + + + + 串口 + + + + + + + + 12 + + + + 端口号: + + + + + + + + 12 + + + + true + + + + + + + + 12 + + + + 波特率: + + + + + + + + 12 + + + + true + + + 9600 + + + 1 + + + + 4800 + + + + + 9600 + + + + + 14400 + + + + + 19200 + + + + + 38400 + + + + + + + + + 12 + + + + 校验位: + + + + + + + + 12 + + + + + None + + + + + Odd + + + + + Even + + + + + + + + + 12 + + + + 数据位: + + + + + + + + 12 + + + + 1 + + + + 7 + + + + + 8 + + + + + + + + + 12 + + + + 停止位: + + + + + + + + 12 + + + + 1 + + + + None + + + + + One + + + + + Two + + + + + OnePointFive + + + + + + + + + 12 + + + + VISA + + + + + + + + 12 + + + + true + + + + @@ -1057,34 +1282,18 @@ - pushButton_12 + pushButton_13 clicked() CheckWindow - showMethod() + showCheck() - 137 - 205 + 1095 + 571 - 666 - 394 - - - - - pushButton_12 - clicked() - CheckWindow - showDevice() - - - 137 - 205 - - - 1332 - 731 + 1328 + 605 @@ -1120,22 +1329,6 @@ - - pushButton_13 - clicked() - CheckWindow - showCheck() - - - 1095 - 571 - - - 1328 - 605 - - - showMethod() diff --git a/softwareDirectory/AutoVerScheme/dialogcheckresult.cpp b/softwareDirectory/AutoVerScheme/dialogcheckresult.cpp index d961d6e..3a10cb0 100644 --- a/softwareDirectory/AutoVerScheme/dialogcheckresult.cpp +++ b/softwareDirectory/AutoVerScheme/dialogcheckresult.cpp @@ -14,3 +14,19 @@ { delete ui; } + +void DialogCheckResult::on_pushButton_3_clicked() +{ + SaveDeviceMeasureInfo measInfo; + BaseCommonApi::InsertSaveDeviceMeasureInfo(measInfo); +} + +void DialogCheckResult::on_pushButton_2_clicked() +{ + +} + +void DialogCheckResult::on_pushButton_clicked() +{ + +} diff --git a/softwareDirectory/AutoVerScheme/dialogcheckresult.h b/softwareDirectory/AutoVerScheme/dialogcheckresult.h index 164e727..aec3b88 100644 --- a/softwareDirectory/AutoVerScheme/dialogcheckresult.h +++ b/softwareDirectory/AutoVerScheme/dialogcheckresult.h @@ -2,6 +2,7 @@ #define DIALOGCHECKRESULT_H #include +#include "basecommonapi.h" namespace Ui { class DialogCheckResult; @@ -15,6 +16,13 @@ explicit DialogCheckResult(QWidget *parent = nullptr); ~DialogCheckResult(); +private slots: + void on_pushButton_3_clicked(); + + void on_pushButton_2_clicked(); + + void on_pushButton_clicked(); + private: Ui::DialogCheckResult *ui; }; diff --git a/softwareDirectory/AutoVerScheme/formverypoint.cpp b/softwareDirectory/AutoVerScheme/formverypoint.cpp index bff9f7f..44698b7 100644 --- a/softwareDirectory/AutoVerScheme/formverypoint.cpp +++ b/softwareDirectory/AutoVerScheme/formverypoint.cpp @@ -24,7 +24,8 @@ //获取核查点tablewight的数据 QStringList headlist; //QString DeviceName = BaseCommonApi::getApparatus(id); - QList bizDeviceManageData=BaseCommonApi::getCheckDCPower(id,&headlist); + //QList bizDeviceManageData=BaseCommonApi::getCheckDCPower(id,&headlist); + QList ptList = BaseCommonApi::getVerificationItemsMultiList(id,&headlist); //QList bizDeviceManageData = BaseCommonApi::getCheckDCPower(id); //设置tablewight ui->tableWidget->setRowCount(0); @@ -39,11 +40,11 @@ int rowCount=0; int row=0; - for (const CheckDCPower& checkDCPower : bizDeviceManageData) + for (const QStringList& item : ptList) { rowCount = ui->tableWidget->rowCount(); ui->tableWidget->insertRow(rowCount); - ui->tableWidget->setItem(row, 0, new QTableWidgetItem(QString::number(row+1))); + /*ui->tableWidget->setItem(row, 0, new QTableWidgetItem(QString::number(row+1))); ui->tableWidget->setItem(row, 1, new QTableWidgetItem(checkDCPower.check_type)); //核查类型 ui->tableWidget->setItem(row, 2, new QTableWidgetItem(checkDCPower.params)); //参数 ui->tableWidget->setItem(row, 3, new QTableWidgetItem(checkDCPower.unit)); //单位 @@ -52,10 +53,15 @@ ui->tableWidget->setItem(row, 6, new QTableWidgetItem(checkDCPower.cycle_number));//循环次数 ui->tableWidget->setItem(row, 7, new QTableWidgetItem(checkDCPower.urel));//urel ui->tableWidget->setItem(row, 8, new QTableWidgetItem(checkDCPower.resistance_value));//电阻值 - ui->tableWidget->setItem(row, 9, new QTableWidgetItem(checkDCPower.resistance_value_unit));//电阻值单位 + ui->tableWidget->setItem(row, 9, new QTableWidgetItem(checkDCPower.resistance_value_unit));//电阻值单位*/ //ui->tableWidget->setItem(row, 0, new QTableWidgetItem(dept.id)); //QDebug + //循环读取值 headlist，count是列的数量 + for(int i=0;itableWidget->setItem(row, i, new QTableWidgetItem(item[i])); + } row++; } diff --git a/softwareDirectory/AutoVerScheme/formverypoint.cpp.autosave b/softwareDirectory/AutoVerScheme/formverypoint.cpp.autosave new file mode 100644 index 0000000..c507e81 --- /dev/null +++ b/softwareDirectory/AutoVerScheme/formverypoint.cpp.autosave @@ -0,0 +1,72 @@ +#include "formverypoint.h" +#include "ui_formverypoint.h" +#include "basecommonapi.h" + +FormVeryPoint::FormVeryPoint(QWidget *parent,QString sId) : + QWidget(parent), + checkId(sId), + ui(new Ui::FormVeryPoint) +{ + ui->setupUi(this); + if(checkId!="") + { + updateTable(checkId); + } +} + +FormVeryPoint::~FormVeryPoint() +{ + delete ui; +} + +void FormVeryPoint::updateTable(QString id) +{ + //获取核查点tablewight的数据 + QStringList headlist; + //QString DeviceName = BaseCommonApi::getApparatus(id); + //QList bizDeviceManageData=BaseCommonApi::getCheckDCPower(id,&headlist); + QList ptList = BaseCommonApi::Search_VerifyTable(id,&headlist); + //QList bizDeviceManageData = BaseCommonApi::getCheckDCPower(id); + //设置tablewight + ui->tableWidget->setRowCount(0); + ui->tableWidget->setColumnCount(headlist.count()); + ui->tableWidget->setHorizontalHeaderLabels(headlist); + ui->tableWidget->verticalHeader()->setParent(nullptr); //隐藏行头 + for(int i=0;itableWidget->horizontalHeader()->setSectionResizeMode(i,QHeaderView::Stretch); + } + //循环数据 + int rowCount=0; + int row=0; + + for (const QStringList& item : ptList) + { + rowCount = ui->tableWidget->rowCount(); + ui->tableWidget->insertRow(rowCount); + /*ui->tableWidget->setItem(row, 0, new QTableWidgetItem(QString::number(row+1))); + ui->tableWidget->setItem(row, 1, new QTableWidgetItem(checkDCPower.check_type)); //核查类型 + ui->tableWidget->setItem(row, 2, new QTableWidgetItem(checkDCPower.params)); //参数 + ui->tableWidget->setItem(row, 3, new QTableWidgetItem(checkDCPower.unit)); //单位 + ui->tableWidget->setItem(row, 4, new QTableWidgetItem(checkDCPower.datum_point));//基准点 + ui->tableWidget->setItem(row, 5, new QTableWidgetItem(checkDCPower.resolution));//分辨力 + ui->tableWidget->setItem(row, 6, new QTableWidgetItem(checkDCPower.cycle_number));//循环次数 + ui->tableWidget->setItem(row, 7, new QTableWidgetItem(checkDCPower.urel));//urel + ui->tableWidget->setItem(row, 8, new QTableWidgetItem(checkDCPower.resistance_value));//电阻值 + ui->tableWidget->setItem(row, 9, new QTableWidgetItem(checkDCPower.resistance_value_unit));//电阻值单位*/ + //ui->tableWidget->setItem(row, 0, new QTableWidgetItem(dept.id)); + + //QDebug + //循环读取值 headlist，count是列的数量 + for(int i=0;itableWidget->setItem(row, i, new QTableWidgetItem(item[i])); + } + row++; + + } +} +void FormVeryPoint::on_pushButton_14_clicked() +{ + this->close(); +} diff --git a/softwareDirectory/AutoVerScheme/verifydevice.cpp b/softwareDirectory/AutoVerScheme/verifydevice.cpp index 0762d9f..591ac5d 100644 --- a/softwareDirectory/AutoVerScheme/verifydevice.cpp +++ b/softwareDirectory/AutoVerScheme/verifydevice.cpp @@ -30,8 +30,8 @@ { int rowCount=0; int row=0; - bizDeviceList = BaseCommonApi::getBizDeviceManage(); - for (const BizDevice& bizDevice : bizDeviceList) { + bizDeviceList = BaseCommonApi::getCheckDeviceList(); + for (const CheckAndTestedDevice& bizDevice : bizDeviceList) { rowCount = ui->tableWidget->rowCount(); ui->tableWidget->insertRow(rowCount); QTableWidgetItem* p_check = new QTableWidgetItem(); @@ -49,8 +49,8 @@ { int rowCount=0; int row=0; - testedDeviceList = BaseCommonApi::getTestedDevice(); - for (const TestedDevice& bizDevice : testedDeviceList) { + testedDeviceList = BaseCommonApi::getCheckAndTestedDeviceList(); + for (const CheckAndTestedDevice& bizDevice : testedDeviceList) { rowCount = ui->tableWidget_2->rowCount(); ui->tableWidget_2->insertRow(rowCount); QTableWidgetItem* p_check = new QTableWidgetItem(); diff --git a/softwareDirectory/AutoVerScheme/verifydevice.h b/softwareDirectory/AutoVerScheme/verifydevice.h index 9a59026..4964b40 100644 --- a/softwareDirectory/AutoVerScheme/verifydevice.h +++ b/softwareDirectory/AutoVerScheme/verifydevice.h @@ -26,8 +26,8 @@ NewVerifyMethod *newVerifyWnd=nullptr; private: Ui::VerifyDevice *ui; - QList testedDeviceList; - QList bizDeviceList; + QList testedDeviceList; + QList bizDeviceList; }; #endif // VERIFYDEVICE_H diff --git a/softwareDirectory/AutoVerScheme/AutoVerScheme.pro.user b/softwareDirectory/AutoVerScheme/AutoVerScheme.pro.user index a7c95f9..73103be 100644 --- a/softwareDirectory/AutoVerScheme/AutoVerScheme.pro.user +++ b/softwareDirectory/AutoVerScheme/AutoVerScheme.pro.user @@ -1,6 +1,6 @@ - + EnvironmentId diff --git a/softwareDirectory/AutoVerScheme/checkwindow.cpp b/softwareDirectory/AutoVerScheme/checkwindow.cpp index da86ad4..2f3e8c6 100644 --- a/softwareDirectory/AutoVerScheme/checkwindow.cpp +++ b/softwareDirectory/AutoVerScheme/checkwindow.cpp @@ -36,13 +36,90 @@ void CheckWindow::showMethod() { - ui->stackedWidget->setCurrentIndex(1); - getCheckMethod(); + QString ids; + for(int i=0;itableWidgetDevice->rowCount();i++){ + Qt::CheckState state = ui->tableWidgetDevice->item(i,0)->checkState(); + if(state == Qt::Checked){ + if(ids=="") + ids = myTaskList[i].id; + else + ids +=";"+ myTaskList[i].id; + //break; + } + } + if(ids==""){ + QMessageBox::warning(this, "提示", "请选择被检设备！"); + }else{ + qDebug() << "select ids:" << ids; + ui->stackedWidget->setCurrentIndex(1); + getCheckMethod(); + } } void CheckWindow::showDevice() { - ui->stackedWidget->setCurrentIndex(2); + QString sId=""; + for(int i=0;itableWidgetMethod->rowCount();i++){ + Qt::CheckState state = ui->tableWidgetMethod->item(i,0)->checkState(); + if(state == Qt::Checked){ + sId = programList[i].id; + break; + } + } + if(sId==""){ + QMessageBox::warning(this, "提示", "请选择检定程序！"); + }else{ + programInfo = BaseCommonApi::getVerificationProgramInfo(sId); + initDeviceInfo(); + ui->stackedWidget->setCurrentIndex(2); + } +} + +void CheckWindow::initDeviceInfo() +{ + QString strStyle = QString("QLabel{image:url(%1);}").arg(programInfo.img_path); + qDebug() << "strStyle:" << strStyle; + ui->label_8->setStyleSheet(strStyle); + + ui->tableWidget_3->clearContents(); + ui->tableWidget_3->setRowCount(0); + QStringList idList; + int rowCount=0; + int row=0; + if(programInfo.tested_device_id!="") + { + idList = programInfo.tested_device_id.split(","); + for(const QString& id : idList) + { + QList result = BaseCommonApi::getTestedCatDevice(id); + if(result.length()>0){ + rowCount = ui->tableWidget_3->rowCount(); + + ui->tableWidget_3->insertRow(rowCount); + ui->tableWidget_3->setItem(row, 0, new QTableWidgetItem(result[0].equipment_name)); + ui->tableWidget_3->setItem(row, 1, new QTableWidgetItem("成功")); //设置数据 + row++; + } + } + idList.clear(); + } + + if(programInfo.standard_device_id!=""){ + idList = programInfo.standard_device_id.split(","); + for(const QString& id : idList) + { + QList result = BaseCommonApi::getCatDeviceInfor(id); + if(result.length()>0){ + rowCount = ui->tableWidget_3->rowCount(); + + ui->tableWidget_3->insertRow(rowCount); + ui->tableWidget_3->setItem(row, 0, new QTableWidgetItem(result[0].equipment_name)); + ui->tableWidget_3->setItem(row, 1, new QTableWidgetItem("成功")); //设置数据 + row++; + } + } + idList.clear(); + } } void CheckWindow::showCheck() @@ -109,7 +186,8 @@ ui->tableWidgetMethod->insertRow(rowCount); QTableWidgetItem* p_check = new QTableWidgetItem(); - p_check->setCheckState(Qt::Unchecked); //设置首列为 CheckBox 控件 + //p_check->setCheckState(Qt::Checked); //设置首列为 CheckBox 控件 + p_check->setCheckState(Qt::Unchecked); ui->tableWidgetMethod->setItem(row,0,p_check); ui->tableWidgetMethod->setItem(row, 1, new QTableWidgetItem(program.program_name)); //设置数据 ui->tableWidgetMethod->setItem(row, 2, new QTableWidgetItem(program.create_name)); //设置数据 @@ -141,3 +219,27 @@ { } + +void CheckWindow::on_tableWidgetDevice_cellChanged(int row, int column) +{ + +} + +void CheckWindow::on_tableWidgetMethod_cellChanged(int row, int column) +{ + Qt::CheckState state = ui->tableWidgetMethod->item(row,0)->checkState(); + if(state == Qt::Checked) + { + for(int i=0;itableWidgetMethod->rowCount();i++){ + if(i!=row) + { + ui->tableWidgetMethod->item(i,0)->setCheckState(Qt::Unchecked); + } + } + } +} + +void CheckWindow::on_pushButton_9_clicked() +{ + showDevice(); +} diff --git a/softwareDirectory/AutoVerScheme/checkwindow.h b/softwareDirectory/AutoVerScheme/checkwindow.h index ea27646..d3fa0c3 100644 --- a/softwareDirectory/AutoVerScheme/checkwindow.h +++ b/softwareDirectory/AutoVerScheme/checkwindow.h @@ -22,13 +22,21 @@ void showMethodWidget(); void showResult(); void on_editButton_clicked(); + void on_tableWidgetDevice_cellChanged(int row, int column); + + void on_tableWidgetMethod_cellChanged(int row, int column); + + void on_pushButton_9_clicked(); + private: void getCheckDevice(); void getCheckMethod(); + void initDeviceInfo(); private: Ui::CheckWindow *ui; QList programList; QList myTaskList; + VerificationProgramInfo programInfo; }; #endif // CHECKWINDOW_H diff --git a/softwareDirectory/AutoVerScheme/checkwindow.ui b/softwareDirectory/AutoVerScheme/checkwindow.ui index 1f7ef8c..c486dcf 100644 --- a/softwareDirectory/AutoVerScheme/checkwindow.ui +++ b/softwareDirectory/AutoVerScheme/checkwindow.ui @@ -548,13 +548,7 @@ - - - - 0 - 0 - - + 120 @@ -812,6 +806,237 @@ 设备接口设置 + + + + + + 12 + + + + 串口 + + + + + + + + 12 + + + + 端口号: + + + + + + + + 12 + + + + true + + + + + + + + 12 + + + + 波特率: + + + + + + + + 12 + + + + true + + + 9600 + + + 1 + + + + 4800 + + + + + 9600 + + + + + 14400 + + + + + 19200 + + + + + 38400 + + + + + + + + + 12 + + + + 校验位: + + + + + + + + 12 + + + + + None + + + + + Odd + + + + + Even + + + + + + + + + 12 + + + + 数据位: + + + + + + + + 12 + + + + 1 + + + + 7 + + + + + 8 + + + + + + + + + 12 + + + + 停止位: + + + + + + + + 12 + + + + 1 + + + + None + + + + + One + + + + + Two + + + + + OnePointFive + + + + + + + + + 12 + + + + VISA + + + + + + + + 12 + + + + true + + + + @@ -1057,34 +1282,18 @@ - pushButton_12 + pushButton_13 clicked() CheckWindow - showMethod() + showCheck() - 137 - 205 + 1095 + 571 - 666 - 394 - - - - - pushButton_12 - clicked() - CheckWindow - showDevice() - - - 137 - 205 - - - 1332 - 731 + 1328 + 605 @@ -1120,22 +1329,6 @@ - - pushButton_13 - clicked() - CheckWindow - showCheck() - - - 1095 - 571 - - - 1328 - 605 - - - showMethod() diff --git a/softwareDirectory/AutoVerScheme/dialogcheckresult.cpp b/softwareDirectory/AutoVerScheme/dialogcheckresult.cpp index d961d6e..3a10cb0 100644 --- a/softwareDirectory/AutoVerScheme/dialogcheckresult.cpp +++ b/softwareDirectory/AutoVerScheme/dialogcheckresult.cpp @@ -14,3 +14,19 @@ { delete ui; } + +void DialogCheckResult::on_pushButton_3_clicked() +{ + SaveDeviceMeasureInfo measInfo; + BaseCommonApi::InsertSaveDeviceMeasureInfo(measInfo); +} + +void DialogCheckResult::on_pushButton_2_clicked() +{ + +} + +void DialogCheckResult::on_pushButton_clicked() +{ + +} diff --git a/softwareDirectory/AutoVerScheme/dialogcheckresult.h b/softwareDirectory/AutoVerScheme/dialogcheckresult.h index 164e727..aec3b88 100644 --- a/softwareDirectory/AutoVerScheme/dialogcheckresult.h +++ b/softwareDirectory/AutoVerScheme/dialogcheckresult.h @@ -2,6 +2,7 @@ #define DIALOGCHECKRESULT_H #include +#include "basecommonapi.h" namespace Ui { class DialogCheckResult; @@ -15,6 +16,13 @@ explicit DialogCheckResult(QWidget *parent = nullptr); ~DialogCheckResult(); +private slots: + void on_pushButton_3_clicked(); + + void on_pushButton_2_clicked(); + + void on_pushButton_clicked(); + private: Ui::DialogCheckResult *ui; }; diff --git a/softwareDirectory/AutoVerScheme/formverypoint.cpp b/softwareDirectory/AutoVerScheme/formverypoint.cpp index bff9f7f..44698b7 100644 --- a/softwareDirectory/AutoVerScheme/formverypoint.cpp +++ b/softwareDirectory/AutoVerScheme/formverypoint.cpp @@ -24,7 +24,8 @@ //获取核查点tablewight的数据 QStringList headlist; //QString DeviceName = BaseCommonApi::getApparatus(id); - QList bizDeviceManageData=BaseCommonApi::getCheckDCPower(id,&headlist); + //QList bizDeviceManageData=BaseCommonApi::getCheckDCPower(id,&headlist); + QList ptList = BaseCommonApi::getVerificationItemsMultiList(id,&headlist); //QList bizDeviceManageData = BaseCommonApi::getCheckDCPower(id); //设置tablewight ui->tableWidget->setRowCount(0); @@ -39,11 +40,11 @@ int rowCount=0; int row=0; - for (const CheckDCPower& checkDCPower : bizDeviceManageData) + for (const QStringList& item : ptList) { rowCount = ui->tableWidget->rowCount(); ui->tableWidget->insertRow(rowCount); - ui->tableWidget->setItem(row, 0, new QTableWidgetItem(QString::number(row+1))); + /*ui->tableWidget->setItem(row, 0, new QTableWidgetItem(QString::number(row+1))); ui->tableWidget->setItem(row, 1, new QTableWidgetItem(checkDCPower.check_type)); //核查类型 ui->tableWidget->setItem(row, 2, new QTableWidgetItem(checkDCPower.params)); //参数 ui->tableWidget->setItem(row, 3, new QTableWidgetItem(checkDCPower.unit)); //单位 @@ -52,10 +53,15 @@ ui->tableWidget->setItem(row, 6, new QTableWidgetItem(checkDCPower.cycle_number));//循环次数 ui->tableWidget->setItem(row, 7, new QTableWidgetItem(checkDCPower.urel));//urel ui->tableWidget->setItem(row, 8, new QTableWidgetItem(checkDCPower.resistance_value));//电阻值 - ui->tableWidget->setItem(row, 9, new QTableWidgetItem(checkDCPower.resistance_value_unit));//电阻值单位 + ui->tableWidget->setItem(row, 9, new QTableWidgetItem(checkDCPower.resistance_value_unit));//电阻值单位*/ //ui->tableWidget->setItem(row, 0, new QTableWidgetItem(dept.id)); //QDebug + //循环读取值 headlist，count是列的数量 + for(int i=0;itableWidget->setItem(row, i, new QTableWidgetItem(item[i])); + } row++; } diff --git a/softwareDirectory/AutoVerScheme/formverypoint.cpp.autosave b/softwareDirectory/AutoVerScheme/formverypoint.cpp.autosave new file mode 100644 index 0000000..c507e81 --- /dev/null +++ b/softwareDirectory/AutoVerScheme/formverypoint.cpp.autosave @@ -0,0 +1,72 @@ +#include "formverypoint.h" +#include "ui_formverypoint.h" +#include "basecommonapi.h" + +FormVeryPoint::FormVeryPoint(QWidget *parent,QString sId) : + QWidget(parent), + checkId(sId), + ui(new Ui::FormVeryPoint) +{ + ui->setupUi(this); + if(checkId!="") + { + updateTable(checkId); + } +} + +FormVeryPoint::~FormVeryPoint() +{ + delete ui; +} + +void FormVeryPoint::updateTable(QString id) +{ + //获取核查点tablewight的数据 + QStringList headlist; + //QString DeviceName = BaseCommonApi::getApparatus(id); + //QList bizDeviceManageData=BaseCommonApi::getCheckDCPower(id,&headlist); + QList ptList = BaseCommonApi::Search_VerifyTable(id,&headlist); + //QList bizDeviceManageData = BaseCommonApi::getCheckDCPower(id); + //设置tablewight + ui->tableWidget->setRowCount(0); + ui->tableWidget->setColumnCount(headlist.count()); + ui->tableWidget->setHorizontalHeaderLabels(headlist); + ui->tableWidget->verticalHeader()->setParent(nullptr); //隐藏行头 + for(int i=0;itableWidget->horizontalHeader()->setSectionResizeMode(i,QHeaderView::Stretch); + } + //循环数据 + int rowCount=0; + int row=0; + + for (const QStringList& item : ptList) + { + rowCount = ui->tableWidget->rowCount(); + ui->tableWidget->insertRow(rowCount); + /*ui->tableWidget->setItem(row, 0, new QTableWidgetItem(QString::number(row+1))); + ui->tableWidget->setItem(row, 1, new QTableWidgetItem(checkDCPower.check_type)); //核查类型 + ui->tableWidget->setItem(row, 2, new QTableWidgetItem(checkDCPower.params)); //参数 + ui->tableWidget->setItem(row, 3, new QTableWidgetItem(checkDCPower.unit)); //单位 + ui->tableWidget->setItem(row, 4, new QTableWidgetItem(checkDCPower.datum_point));//基准点 + ui->tableWidget->setItem(row, 5, new QTableWidgetItem(checkDCPower.resolution));//分辨力 + ui->tableWidget->setItem(row, 6, new QTableWidgetItem(checkDCPower.cycle_number));//循环次数 + ui->tableWidget->setItem(row, 7, new QTableWidgetItem(checkDCPower.urel));//urel + ui->tableWidget->setItem(row, 8, new QTableWidgetItem(checkDCPower.resistance_value));//电阻值 + ui->tableWidget->setItem(row, 9, new QTableWidgetItem(checkDCPower.resistance_value_unit));//电阻值单位*/ + //ui->tableWidget->setItem(row, 0, new QTableWidgetItem(dept.id)); + + //QDebug + //循环读取值 headlist，count是列的数量 + for(int i=0;itableWidget->setItem(row, i, new QTableWidgetItem(item[i])); + } + row++; + + } +} +void FormVeryPoint::on_pushButton_14_clicked() +{ + this->close(); +} diff --git a/softwareDirectory/AutoVerScheme/verifydevice.cpp b/softwareDirectory/AutoVerScheme/verifydevice.cpp index 0762d9f..591ac5d 100644 --- a/softwareDirectory/AutoVerScheme/verifydevice.cpp +++ b/softwareDirectory/AutoVerScheme/verifydevice.cpp @@ -30,8 +30,8 @@ { int rowCount=0; int row=0; - bizDeviceList = BaseCommonApi::getBizDeviceManage(); - for (const BizDevice& bizDevice : bizDeviceList) { + bizDeviceList = BaseCommonApi::getCheckDeviceList(); + for (const CheckAndTestedDevice& bizDevice : bizDeviceList) { rowCount = ui->tableWidget->rowCount(); ui->tableWidget->insertRow(rowCount); QTableWidgetItem* p_check = new QTableWidgetItem(); @@ -49,8 +49,8 @@ { int rowCount=0; int row=0; - testedDeviceList = BaseCommonApi::getTestedDevice(); - for (const TestedDevice& bizDevice : testedDeviceList) { + testedDeviceList = BaseCommonApi::getCheckAndTestedDeviceList(); + for (const CheckAndTestedDevice& bizDevice : testedDeviceList) { rowCount = ui->tableWidget_2->rowCount(); ui->tableWidget_2->insertRow(rowCount); QTableWidgetItem* p_check = new QTableWidgetItem(); diff --git a/softwareDirectory/AutoVerScheme/verifydevice.h b/softwareDirectory/AutoVerScheme/verifydevice.h index 9a59026..4964b40 100644 --- a/softwareDirectory/AutoVerScheme/verifydevice.h +++ b/softwareDirectory/AutoVerScheme/verifydevice.h @@ -26,8 +26,8 @@ NewVerifyMethod *newVerifyWnd=nullptr; private: Ui::VerifyDevice *ui; - QList testedDeviceList; - QList bizDeviceList; + QList testedDeviceList; + QList bizDeviceList; }; #endif // VERIFYDEVICE_H diff --git a/softwareDirectory/AutoVerScheme/verifywindow.cpp b/softwareDirectory/AutoVerScheme/verifywindow.cpp index f51ac9d..a18d39d 100644 --- a/softwareDirectory/AutoVerScheme/verifywindow.cpp +++ b/softwareDirectory/AutoVerScheme/verifywindow.cpp @@ -1,5 +1,6 @@ #include "verifywindow.h" #include "ui_verifywindow.h" +#include VerifyWindow::VerifyWindow(QWidget *parent) : QWidget(parent), @@ -58,10 +59,40 @@ void VerifyWindow::showDevice() { - ui->stackedWidget->setCurrentIndex(1); + QString sId=""; + for(int i=0;itableWidgetMethod->rowCount();i++){ + Qt::CheckState state = ui->tableWidgetMethod->item(i,0)->checkState(); + if(state == Qt::Checked){ + sId = programList[i].id; + break; + } + } + if(sId==""){ + QMessageBox::warning(this, "提示", "请选择检定程序！"); + }else{ + programInfo = BaseCommonApi::getCheckProgramManageById(sId); + QString strStyle = QString("QLabel{image:url(%1);}").arg(programInfo.img_path); + qDebug() << "strStyle:" << strStyle ; + ui->label_8->setStyleSheet(strStyle); + ui->stackedWidget->setCurrentIndex(1); + } } void VerifyWindow::on_editButton_clicked() { } + +void VerifyWindow::on_tableWidgetMethod_cellChanged(int row, int column) +{ + Qt::CheckState state = ui->tableWidgetMethod->item(row,0)->checkState(); + if(state == Qt::Checked) + { + for(int i=0;itableWidgetMethod->rowCount();i++){ + if(i!=row) + { + ui->tableWidgetMethod->item(i,0)->setCheckState(Qt::Unchecked); + } + } + } +} diff --git a/softwareDirectory/AutoVerScheme/AutoVerScheme.pro.user b/softwareDirectory/AutoVerScheme/AutoVerScheme.pro.user index a7c95f9..73103be 100644 --- a/softwareDirectory/AutoVerScheme/AutoVerScheme.pro.user +++ b/softwareDirectory/AutoVerScheme/AutoVerScheme.pro.user @@ -1,6 +1,6 @@ - + EnvironmentId diff --git a/softwareDirectory/AutoVerScheme/checkwindow.cpp b/softwareDirectory/AutoVerScheme/checkwindow.cpp index da86ad4..2f3e8c6 100644 --- a/softwareDirectory/AutoVerScheme/checkwindow.cpp +++ b/softwareDirectory/AutoVerScheme/checkwindow.cpp @@ -36,13 +36,90 @@ void CheckWindow::showMethod() { - ui->stackedWidget->setCurrentIndex(1); - getCheckMethod(); + QString ids; + for(int i=0;itableWidgetDevice->rowCount();i++){ + Qt::CheckState state = ui->tableWidgetDevice->item(i,0)->checkState(); + if(state == Qt::Checked){ + if(ids=="") + ids = myTaskList[i].id; + else + ids +=";"+ myTaskList[i].id; + //break; + } + } + if(ids==""){ + QMessageBox::warning(this, "提示", "请选择被检设备！"); + }else{ + qDebug() << "select ids:" << ids; + ui->stackedWidget->setCurrentIndex(1); + getCheckMethod(); + } } void CheckWindow::showDevice() { - ui->stackedWidget->setCurrentIndex(2); + QString sId=""; + for(int i=0;itableWidgetMethod->rowCount();i++){ + Qt::CheckState state = ui->tableWidgetMethod->item(i,0)->checkState(); + if(state == Qt::Checked){ + sId = programList[i].id; + break; + } + } + if(sId==""){ + QMessageBox::warning(this, "提示", "请选择检定程序！"); + }else{ + programInfo = BaseCommonApi::getVerificationProgramInfo(sId); + initDeviceInfo(); + ui->stackedWidget->setCurrentIndex(2); + } +} + +void CheckWindow::initDeviceInfo() +{ + QString strStyle = QString("QLabel{image:url(%1);}").arg(programInfo.img_path); + qDebug() << "strStyle:" << strStyle; + ui->label_8->setStyleSheet(strStyle); + + ui->tableWidget_3->clearContents(); + ui->tableWidget_3->setRowCount(0); + QStringList idList; + int rowCount=0; + int row=0; + if(programInfo.tested_device_id!="") + { + idList = programInfo.tested_device_id.split(","); + for(const QString& id : idList) + { + QList result = BaseCommonApi::getTestedCatDevice(id); + if(result.length()>0){ + rowCount = ui->tableWidget_3->rowCount(); + + ui->tableWidget_3->insertRow(rowCount); + ui->tableWidget_3->setItem(row, 0, new QTableWidgetItem(result[0].equipment_name)); + ui->tableWidget_3->setItem(row, 1, new QTableWidgetItem("成功")); //设置数据 + row++; + } + } + idList.clear(); + } + + if(programInfo.standard_device_id!=""){ + idList = programInfo.standard_device_id.split(","); + for(const QString& id : idList) + { + QList result = BaseCommonApi::getCatDeviceInfor(id); + if(result.length()>0){ + rowCount = ui->tableWidget_3->rowCount(); + + ui->tableWidget_3->insertRow(rowCount); + ui->tableWidget_3->setItem(row, 0, new QTableWidgetItem(result[0].equipment_name)); + ui->tableWidget_3->setItem(row, 1, new QTableWidgetItem("成功")); //设置数据 + row++; + } + } + idList.clear(); + } } void CheckWindow::showCheck() @@ -109,7 +186,8 @@ ui->tableWidgetMethod->insertRow(rowCount); QTableWidgetItem* p_check = new QTableWidgetItem(); - p_check->setCheckState(Qt::Unchecked); //设置首列为 CheckBox 控件 + //p_check->setCheckState(Qt::Checked); //设置首列为 CheckBox 控件 + p_check->setCheckState(Qt::Unchecked); ui->tableWidgetMethod->setItem(row,0,p_check); ui->tableWidgetMethod->setItem(row, 1, new QTableWidgetItem(program.program_name)); //设置数据 ui->tableWidgetMethod->setItem(row, 2, new QTableWidgetItem(program.create_name)); //设置数据 @@ -141,3 +219,27 @@ { } + +void CheckWindow::on_tableWidgetDevice_cellChanged(int row, int column) +{ + +} + +void CheckWindow::on_tableWidgetMethod_cellChanged(int row, int column) +{ + Qt::CheckState state = ui->tableWidgetMethod->item(row,0)->checkState(); + if(state == Qt::Checked) + { + for(int i=0;itableWidgetMethod->rowCount();i++){ + if(i!=row) + { + ui->tableWidgetMethod->item(i,0)->setCheckState(Qt::Unchecked); + } + } + } +} + +void CheckWindow::on_pushButton_9_clicked() +{ + showDevice(); +} diff --git a/softwareDirectory/AutoVerScheme/checkwindow.h b/softwareDirectory/AutoVerScheme/checkwindow.h index ea27646..d3fa0c3 100644 --- a/softwareDirectory/AutoVerScheme/checkwindow.h +++ b/softwareDirectory/AutoVerScheme/checkwindow.h @@ -22,13 +22,21 @@ void showMethodWidget(); void showResult(); void on_editButton_clicked(); + void on_tableWidgetDevice_cellChanged(int row, int column); + + void on_tableWidgetMethod_cellChanged(int row, int column); + + void on_pushButton_9_clicked(); + private: void getCheckDevice(); void getCheckMethod(); + void initDeviceInfo(); private: Ui::CheckWindow *ui; QList programList; QList myTaskList; + VerificationProgramInfo programInfo; }; #endif // CHECKWINDOW_H diff --git a/softwareDirectory/AutoVerScheme/checkwindow.ui b/softwareDirectory/AutoVerScheme/checkwindow.ui index 1f7ef8c..c486dcf 100644 --- a/softwareDirectory/AutoVerScheme/checkwindow.ui +++ b/softwareDirectory/AutoVerScheme/checkwindow.ui @@ -548,13 +548,7 @@ - - - - 0 - 0 - - + 120 @@ -812,6 +806,237 @@ 设备接口设置 + + + + + + 12 + + + + 串口 + + + + + + + + 12 + + + + 端口号: + + + + + + + + 12 + + + + true + + + + + + + + 12 + + + + 波特率: + + + + + + + + 12 + + + + true + + + 9600 + + + 1 + + + + 4800 + + + + + 9600 + + + + + 14400 + + + + + 19200 + + + + + 38400 + + + + + + + + + 12 + + + + 校验位: + + + + + + + + 12 + + + + + None + + + + + Odd + + + + + Even + + + + + + + + + 12 + + + + 数据位: + + + + + + + + 12 + + + + 1 + + + + 7 + + + + + 8 + + + + + + + + + 12 + + + + 停止位: + + + + + + + + 12 + + + + 1 + + + + None + + + + + One + + + + + Two + + + + + OnePointFive + + + + + + + + + 12 + + + + VISA + + + + + + + + 12 + + + + true + + + + @@ -1057,34 +1282,18 @@ - pushButton_12 + pushButton_13 clicked() CheckWindow - showMethod() + showCheck() - 137 - 205 + 1095 + 571 - 666 - 394 - - - - - pushButton_12 - clicked() - CheckWindow - showDevice() - - - 137 - 205 - - - 1332 - 731 + 1328 + 605 @@ -1120,22 +1329,6 @@ - - pushButton_13 - clicked() - CheckWindow - showCheck() - - - 1095 - 571 - - - 1328 - 605 - - - showMethod() diff --git a/softwareDirectory/AutoVerScheme/dialogcheckresult.cpp b/softwareDirectory/AutoVerScheme/dialogcheckresult.cpp index d961d6e..3a10cb0 100644 --- a/softwareDirectory/AutoVerScheme/dialogcheckresult.cpp +++ b/softwareDirectory/AutoVerScheme/dialogcheckresult.cpp @@ -14,3 +14,19 @@ { delete ui; } + +void DialogCheckResult::on_pushButton_3_clicked() +{ + SaveDeviceMeasureInfo measInfo; + BaseCommonApi::InsertSaveDeviceMeasureInfo(measInfo); +} + +void DialogCheckResult::on_pushButton_2_clicked() +{ + +} + +void DialogCheckResult::on_pushButton_clicked() +{ + +} diff --git a/softwareDirectory/AutoVerScheme/dialogcheckresult.h b/softwareDirectory/AutoVerScheme/dialogcheckresult.h index 164e727..aec3b88 100644 --- a/softwareDirectory/AutoVerScheme/dialogcheckresult.h +++ b/softwareDirectory/AutoVerScheme/dialogcheckresult.h @@ -2,6 +2,7 @@ #define DIALOGCHECKRESULT_H #include +#include "basecommonapi.h" namespace Ui { class DialogCheckResult; @@ -15,6 +16,13 @@ explicit DialogCheckResult(QWidget *parent = nullptr); ~DialogCheckResult(); +private slots: + void on_pushButton_3_clicked(); + + void on_pushButton_2_clicked(); + + void on_pushButton_clicked(); + private: Ui::DialogCheckResult *ui; }; diff --git a/softwareDirectory/AutoVerScheme/formverypoint.cpp b/softwareDirectory/AutoVerScheme/formverypoint.cpp index bff9f7f..44698b7 100644 --- a/softwareDirectory/AutoVerScheme/formverypoint.cpp +++ b/softwareDirectory/AutoVerScheme/formverypoint.cpp @@ -24,7 +24,8 @@ //获取核查点tablewight的数据 QStringList headlist; //QString DeviceName = BaseCommonApi::getApparatus(id); - QList bizDeviceManageData=BaseCommonApi::getCheckDCPower(id,&headlist); + //QList bizDeviceManageData=BaseCommonApi::getCheckDCPower(id,&headlist); + QList ptList = BaseCommonApi::getVerificationItemsMultiList(id,&headlist); //QList bizDeviceManageData = BaseCommonApi::getCheckDCPower(id); //设置tablewight ui->tableWidget->setRowCount(0); @@ -39,11 +40,11 @@ int rowCount=0; int row=0; - for (const CheckDCPower& checkDCPower : bizDeviceManageData) + for (const QStringList& item : ptList) { rowCount = ui->tableWidget->rowCount(); ui->tableWidget->insertRow(rowCount); - ui->tableWidget->setItem(row, 0, new QTableWidgetItem(QString::number(row+1))); + /*ui->tableWidget->setItem(row, 0, new QTableWidgetItem(QString::number(row+1))); ui->tableWidget->setItem(row, 1, new QTableWidgetItem(checkDCPower.check_type)); //核查类型 ui->tableWidget->setItem(row, 2, new QTableWidgetItem(checkDCPower.params)); //参数 ui->tableWidget->setItem(row, 3, new QTableWidgetItem(checkDCPower.unit)); //单位 @@ -52,10 +53,15 @@ ui->tableWidget->setItem(row, 6, new QTableWidgetItem(checkDCPower.cycle_number));//循环次数 ui->tableWidget->setItem(row, 7, new QTableWidgetItem(checkDCPower.urel));//urel ui->tableWidget->setItem(row, 8, new QTableWidgetItem(checkDCPower.resistance_value));//电阻值 - ui->tableWidget->setItem(row, 9, new QTableWidgetItem(checkDCPower.resistance_value_unit));//电阻值单位 + ui->tableWidget->setItem(row, 9, new QTableWidgetItem(checkDCPower.resistance_value_unit));//电阻值单位*/ //ui->tableWidget->setItem(row, 0, new QTableWidgetItem(dept.id)); //QDebug + //循环读取值 headlist，count是列的数量 + for(int i=0;itableWidget->setItem(row, i, new QTableWidgetItem(item[i])); + } row++; } diff --git a/softwareDirectory/AutoVerScheme/formverypoint.cpp.autosave b/softwareDirectory/AutoVerScheme/formverypoint.cpp.autosave new file mode 100644 index 0000000..c507e81 --- /dev/null +++ b/softwareDirectory/AutoVerScheme/formverypoint.cpp.autosave @@ -0,0 +1,72 @@ +#include "formverypoint.h" +#include "ui_formverypoint.h" +#include "basecommonapi.h" + +FormVeryPoint::FormVeryPoint(QWidget *parent,QString sId) : + QWidget(parent), + checkId(sId), + ui(new Ui::FormVeryPoint) +{ + ui->setupUi(this); + if(checkId!="") + { + updateTable(checkId); + } +} + +FormVeryPoint::~FormVeryPoint() +{ + delete ui; +} + +void FormVeryPoint::updateTable(QString id) +{ + //获取核查点tablewight的数据 + QStringList headlist; + //QString DeviceName = BaseCommonApi::getApparatus(id); + //QList bizDeviceManageData=BaseCommonApi::getCheckDCPower(id,&headlist); + QList ptList = BaseCommonApi::Search_VerifyTable(id,&headlist); + //QList bizDeviceManageData = BaseCommonApi::getCheckDCPower(id); + //设置tablewight + ui->tableWidget->setRowCount(0); + ui->tableWidget->setColumnCount(headlist.count()); + ui->tableWidget->setHorizontalHeaderLabels(headlist); + ui->tableWidget->verticalHeader()->setParent(nullptr); //隐藏行头 + for(int i=0;itableWidget->horizontalHeader()->setSectionResizeMode(i,QHeaderView::Stretch); + } + //循环数据 + int rowCount=0; + int row=0; + + for (const QStringList& item : ptList) + { + rowCount = ui->tableWidget->rowCount(); + ui->tableWidget->insertRow(rowCount); + /*ui->tableWidget->setItem(row, 0, new QTableWidgetItem(QString::number(row+1))); + ui->tableWidget->setItem(row, 1, new QTableWidgetItem(checkDCPower.check_type)); //核查类型 + ui->tableWidget->setItem(row, 2, new QTableWidgetItem(checkDCPower.params)); //参数 + ui->tableWidget->setItem(row, 3, new QTableWidgetItem(checkDCPower.unit)); //单位 + ui->tableWidget->setItem(row, 4, new QTableWidgetItem(checkDCPower.datum_point));//基准点 + ui->tableWidget->setItem(row, 5, new QTableWidgetItem(checkDCPower.resolution));//分辨力 + ui->tableWidget->setItem(row, 6, new QTableWidgetItem(checkDCPower.cycle_number));//循环次数 + ui->tableWidget->setItem(row, 7, new QTableWidgetItem(checkDCPower.urel));//urel + ui->tableWidget->setItem(row, 8, new QTableWidgetItem(checkDCPower.resistance_value));//电阻值 + ui->tableWidget->setItem(row, 9, new QTableWidgetItem(checkDCPower.resistance_value_unit));//电阻值单位*/ + //ui->tableWidget->setItem(row, 0, new QTableWidgetItem(dept.id)); + + //QDebug + //循环读取值 headlist，count是列的数量 + for(int i=0;itableWidget->setItem(row, i, new QTableWidgetItem(item[i])); + } + row++; + + } +} +void FormVeryPoint::on_pushButton_14_clicked() +{ + this->close(); +} diff --git a/softwareDirectory/AutoVerScheme/verifydevice.cpp b/softwareDirectory/AutoVerScheme/verifydevice.cpp index 0762d9f..591ac5d 100644 --- a/softwareDirectory/AutoVerScheme/verifydevice.cpp +++ b/softwareDirectory/AutoVerScheme/verifydevice.cpp @@ -30,8 +30,8 @@ { int rowCount=0; int row=0; - bizDeviceList = BaseCommonApi::getBizDeviceManage(); - for (const BizDevice& bizDevice : bizDeviceList) { + bizDeviceList = BaseCommonApi::getCheckDeviceList(); + for (const CheckAndTestedDevice& bizDevice : bizDeviceList) { rowCount = ui->tableWidget->rowCount(); ui->tableWidget->insertRow(rowCount); QTableWidgetItem* p_check = new QTableWidgetItem(); @@ -49,8 +49,8 @@ { int rowCount=0; int row=0; - testedDeviceList = BaseCommonApi::getTestedDevice(); - for (const TestedDevice& bizDevice : testedDeviceList) { + testedDeviceList = BaseCommonApi::getCheckAndTestedDeviceList(); + for (const CheckAndTestedDevice& bizDevice : testedDeviceList) { rowCount = ui->tableWidget_2->rowCount(); ui->tableWidget_2->insertRow(rowCount); QTableWidgetItem* p_check = new QTableWidgetItem(); diff --git a/softwareDirectory/AutoVerScheme/verifydevice.h b/softwareDirectory/AutoVerScheme/verifydevice.h index 9a59026..4964b40 100644 --- a/softwareDirectory/AutoVerScheme/verifydevice.h +++ b/softwareDirectory/AutoVerScheme/verifydevice.h @@ -26,8 +26,8 @@ NewVerifyMethod *newVerifyWnd=nullptr; private: Ui::VerifyDevice *ui; - QList testedDeviceList; - QList bizDeviceList; + QList testedDeviceList; + QList bizDeviceList; }; #endif // VERIFYDEVICE_H diff --git a/softwareDirectory/AutoVerScheme/verifywindow.cpp b/softwareDirectory/AutoVerScheme/verifywindow.cpp index f51ac9d..a18d39d 100644 --- a/softwareDirectory/AutoVerScheme/verifywindow.cpp +++ b/softwareDirectory/AutoVerScheme/verifywindow.cpp @@ -1,5 +1,6 @@ #include "verifywindow.h" #include "ui_verifywindow.h" +#include VerifyWindow::VerifyWindow(QWidget *parent) : QWidget(parent), @@ -58,10 +59,40 @@ void VerifyWindow::showDevice() { - ui->stackedWidget->setCurrentIndex(1); + QString sId=""; + for(int i=0;itableWidgetMethod->rowCount();i++){ + Qt::CheckState state = ui->tableWidgetMethod->item(i,0)->checkState(); + if(state == Qt::Checked){ + sId = programList[i].id; + break; + } + } + if(sId==""){ + QMessageBox::warning(this, "提示", "请选择检定程序！"); + }else{ + programInfo = BaseCommonApi::getCheckProgramManageById(sId); + QString strStyle = QString("QLabel{image:url(%1);}").arg(programInfo.img_path); + qDebug() << "strStyle:" << strStyle ; + ui->label_8->setStyleSheet(strStyle); + ui->stackedWidget->setCurrentIndex(1); + } } void VerifyWindow::on_editButton_clicked() { } + +void VerifyWindow::on_tableWidgetMethod_cellChanged(int row, int column) +{ + Qt::CheckState state = ui->tableWidgetMethod->item(row,0)->checkState(); + if(state == Qt::Checked) + { + for(int i=0;itableWidgetMethod->rowCount();i++){ + if(i!=row) + { + ui->tableWidgetMethod->item(i,0)->setCheckState(Qt::Unchecked); + } + } + } +} diff --git a/softwareDirectory/AutoVerScheme/verifywindow.h b/softwareDirectory/AutoVerScheme/verifywindow.h index e44f955..796487f 100644 --- a/softwareDirectory/AutoVerScheme/verifywindow.h +++ b/softwareDirectory/AutoVerScheme/verifywindow.h @@ -21,9 +21,12 @@ void showDevice(); void on_editButton_clicked(); + void on_tableWidgetMethod_cellChanged(int row, int column); + private: Ui::VerifyWindow *ui; QList programList; + CheckProgramManage programInfo; }; #endif // VERIFYWINDOW_H