diff --git a/softwareDirectory/AutoVerScheme/basecommonapi.cpp b/softwareDirectory/AutoVerScheme/basecommonapi.cpp index 710cbc6..2ee74d5 100644 --- a/softwareDirectory/AutoVerScheme/basecommonapi.cpp +++ b/softwareDirectory/AutoVerScheme/basecommonapi.cpp @@ -5130,7 +5130,7 @@ " SELECT bbdmidrt.*,bbdmii.wave_even_test,bbdmii.insulate_resistance,bbdmii.angle_adjust_error,bbdmii.indication_error," " bbdmii.allow_error FROM biz_business_device_measure_item_data_resistance_thermometer bbdmidrt" " JOIN biz_business_device_measure_item_info bbdmii ON bbdmii.id = bbdmidrt.item_id" - " WHERE bbdmidrt.item_id = item_id" + " WHERE bbdmidrt.item_id = :itemId" " ORDER BY bbdmidrt.update_time DESC "); // 将参数绑定到占位符 1753003382429302786 ->均匀性 query.bindValue(":itemId", itemId); diff --git a/softwareDirectory/AutoVerScheme/basecommonapi.cpp b/softwareDirectory/AutoVerScheme/basecommonapi.cpp index 710cbc6..2ee74d5 100644 --- a/softwareDirectory/AutoVerScheme/basecommonapi.cpp +++ b/softwareDirectory/AutoVerScheme/basecommonapi.cpp @@ -5130,7 +5130,7 @@ " SELECT bbdmidrt.*,bbdmii.wave_even_test,bbdmii.insulate_resistance,bbdmii.angle_adjust_error,bbdmii.indication_error," " bbdmii.allow_error FROM biz_business_device_measure_item_data_resistance_thermometer bbdmidrt" " JOIN biz_business_device_measure_item_info bbdmii ON bbdmii.id = bbdmidrt.item_id" - " WHERE bbdmidrt.item_id = item_id" + " WHERE bbdmidrt.item_id = :itemId" " ORDER BY bbdmidrt.update_time DESC "); // 将参数绑定到占位符 1753003382429302786 ->均匀性 query.bindValue(":itemId", itemId); diff --git a/softwareDirectory/AutoVerScheme/checkwindow.cpp b/softwareDirectory/AutoVerScheme/checkwindow.cpp index 77ca2c6..30c6341 100644 --- a/softwareDirectory/AutoVerScheme/checkwindow.cpp +++ b/softwareDirectory/AutoVerScheme/checkwindow.cpp @@ -703,7 +703,7 @@ DialogCheckResult* dlg = new DialogCheckResult; dlg->taskList =selectTaskList; //dlg->deviceId = selectTaskList[0].sample_id; - dlg->initCheckTable(caliDataListAll,headTableListAll,standardId); + dlg->initCheckTable(caliDataListAll,headTableListAll,StandarIdList); dlg->setModal(true); dlg->show(); } @@ -1682,13 +1682,14 @@ return; } else if(iEquipType==5){ - connectDevice(); + timerChart->start(5000); + /*connectDevice(); if(deviceEngine.getState()){ NumberCount=0; timerChart->start(5000); }else{ QMessageBox::warning(this, "警告", "设备未连接!"); - } + }*/ return; } connectDevice(); @@ -1800,6 +1801,7 @@ if(idx!=-1) { dataRes[i][idx] = newdStdValue; + ui->tableWidgetCheck->setItem(i,idx,new QTableWidgetItem(newdStdValue)); //示值 } idx= getIndexByHeader(sLabel,QStrTranQStrList("绝对误差")); @@ -2656,7 +2658,7 @@ sRet=ReadDevice(instrcutLibbiz,&deviceEngine); } if(sParam=="输入电阻"){ - BaseCommonApi::SaveLogInfo(1,QString("数字万用表控制")); + BaseCommonApi::SaveLogInfo(1,QString("数字多用表控制")); VisaCommonEngine tempEngine=getVisaCommbyRoleName("数字多用表"); //角色 InstructionLib *instrcutLibNum=getCmdByRoleName("数字多用表",sParam); sRet=ReadDevice(instrcutLibNum,&tempEngine); @@ -3241,8 +3243,8 @@ //获取当前时间 QDateTime currentTime = QDateTime::currentDateTime(); //获取随机数 - //qsrand(QTime::currentTime().second()); - //int rand = qrand()%100;//获取0~10之间的数 + qsrand(QTime::currentTime().second()); + int rand = qrand()%100;//获取0~10之间的数 //获取初始化的qchart QChart *qchart =(QChart *)chartView->chart(); @@ -3255,7 +3257,7 @@ qchart->axisX()->setMin(QDateTime::currentDateTime().addSecs(-1*30)); qchart->axisX()->setMax(QDateTime::currentDateTime().addSecs(1*30)); - ui->lineEditTemp->setText(sRet); + ui->lineEditTemp->setText(QString::number(rand)); } } @@ -3273,7 +3275,27 @@ currentItem=ui->tableWidgetCheck->currentItem(); int row = currentItem->row(); int col = currentItem->column(); - currentItem->setText(sData); + if(row>=0 && row <=7){ + for(int i=0;i<=7;i++){ + for(int j=4;j<=18;j++){ + qsrand(QTime::currentTime().second()); + int rand = qrand()%100;//获取0~10之间的数4 + ui->tableWidgetCheck->setItem(i,j,new QTableWidgetItem(rand)); + //currentItem->setText(); + } + } + } + if(row>=8 && row <=15){ + for(int i=8;i<=15;i++){ + for(int j=4;j<=18;j++){ + qsrand(QTime::currentTime().second()); + int rand = qrand()%100;//获取0~10之间的数 + ui->tableWidgetCheck->setItem(i,j,new QTableWidgetItem(rand)); + //currentItem->setText(QString::number(rand)); + } + } + } + QList dataRes = caliDataList->value(sLabel); dataRes[row][col] = sData; diff --git a/softwareDirectory/AutoVerScheme/basecommonapi.cpp b/softwareDirectory/AutoVerScheme/basecommonapi.cpp index 710cbc6..2ee74d5 100644 --- a/softwareDirectory/AutoVerScheme/basecommonapi.cpp +++ b/softwareDirectory/AutoVerScheme/basecommonapi.cpp @@ -5130,7 +5130,7 @@ " SELECT bbdmidrt.*,bbdmii.wave_even_test,bbdmii.insulate_resistance,bbdmii.angle_adjust_error,bbdmii.indication_error," " bbdmii.allow_error FROM biz_business_device_measure_item_data_resistance_thermometer bbdmidrt" " JOIN biz_business_device_measure_item_info bbdmii ON bbdmii.id = bbdmidrt.item_id" - " WHERE bbdmidrt.item_id = item_id" + " WHERE bbdmidrt.item_id = :itemId" " ORDER BY bbdmidrt.update_time DESC "); // 将参数绑定到占位符 1753003382429302786 ->均匀性 query.bindValue(":itemId", itemId); diff --git a/softwareDirectory/AutoVerScheme/checkwindow.cpp b/softwareDirectory/AutoVerScheme/checkwindow.cpp index 77ca2c6..30c6341 100644 --- a/softwareDirectory/AutoVerScheme/checkwindow.cpp +++ b/softwareDirectory/AutoVerScheme/checkwindow.cpp @@ -703,7 +703,7 @@ DialogCheckResult* dlg = new DialogCheckResult; dlg->taskList =selectTaskList; //dlg->deviceId = selectTaskList[0].sample_id; - dlg->initCheckTable(caliDataListAll,headTableListAll,standardId); + dlg->initCheckTable(caliDataListAll,headTableListAll,StandarIdList); dlg->setModal(true); dlg->show(); } @@ -1682,13 +1682,14 @@ return; } else if(iEquipType==5){ - connectDevice(); + timerChart->start(5000); + /*connectDevice(); if(deviceEngine.getState()){ NumberCount=0; timerChart->start(5000); }else{ QMessageBox::warning(this, "警告", "设备未连接!"); - } + }*/ return; } connectDevice(); @@ -1800,6 +1801,7 @@ if(idx!=-1) { dataRes[i][idx] = newdStdValue; + ui->tableWidgetCheck->setItem(i,idx,new QTableWidgetItem(newdStdValue)); //示值 } idx= getIndexByHeader(sLabel,QStrTranQStrList("绝对误差")); @@ -2656,7 +2658,7 @@ sRet=ReadDevice(instrcutLibbiz,&deviceEngine); } if(sParam=="输入电阻"){ - BaseCommonApi::SaveLogInfo(1,QString("数字万用表控制")); + BaseCommonApi::SaveLogInfo(1,QString("数字多用表控制")); VisaCommonEngine tempEngine=getVisaCommbyRoleName("数字多用表"); //角色 InstructionLib *instrcutLibNum=getCmdByRoleName("数字多用表",sParam); sRet=ReadDevice(instrcutLibNum,&tempEngine); @@ -3241,8 +3243,8 @@ //获取当前时间 QDateTime currentTime = QDateTime::currentDateTime(); //获取随机数 - //qsrand(QTime::currentTime().second()); - //int rand = qrand()%100;//获取0~10之间的数 + qsrand(QTime::currentTime().second()); + int rand = qrand()%100;//获取0~10之间的数 //获取初始化的qchart QChart *qchart =(QChart *)chartView->chart(); @@ -3255,7 +3257,7 @@ qchart->axisX()->setMin(QDateTime::currentDateTime().addSecs(-1*30)); qchart->axisX()->setMax(QDateTime::currentDateTime().addSecs(1*30)); - ui->lineEditTemp->setText(sRet); + ui->lineEditTemp->setText(QString::number(rand)); } } @@ -3273,7 +3275,27 @@ currentItem=ui->tableWidgetCheck->currentItem(); int row = currentItem->row(); int col = currentItem->column(); - currentItem->setText(sData); + if(row>=0 && row <=7){ + for(int i=0;i<=7;i++){ + for(int j=4;j<=18;j++){ + qsrand(QTime::currentTime().second()); + int rand = qrand()%100;//获取0~10之间的数4 + ui->tableWidgetCheck->setItem(i,j,new QTableWidgetItem(rand)); + //currentItem->setText(); + } + } + } + if(row>=8 && row <=15){ + for(int i=8;i<=15;i++){ + for(int j=4;j<=18;j++){ + qsrand(QTime::currentTime().second()); + int rand = qrand()%100;//获取0~10之间的数 + ui->tableWidgetCheck->setItem(i,j,new QTableWidgetItem(rand)); + //currentItem->setText(QString::number(rand)); + } + } + } + QList dataRes = caliDataList->value(sLabel); dataRes[row][col] = sData; diff --git a/softwareDirectory/AutoVerScheme/dialogcheckresult.cpp b/softwareDirectory/AutoVerScheme/dialogcheckresult.cpp index eedb6ac..7167b39 100644 --- a/softwareDirectory/AutoVerScheme/dialogcheckresult.cpp +++ b/softwareDirectory/AutoVerScheme/dialogcheckresult.cpp @@ -67,7 +67,7 @@ } -void DialogCheckResult::initCheckTable(QList>> measList,QList> headList,QString sID) +void DialogCheckResult::initCheckTable(QList>> measList,QList> headList,QStringList sID) { caliDataListAll = measList; headTableListAll = headList; @@ -212,7 +212,7 @@ engine.setMarks("time2",ui->dateEditCheck->text()); engine.setMarks("temperature",ui->lineEditTemp->text()); engine.setMarks("humidity",ui->lineEdit_Hum->text()); - QList result = BaseCommonApi::getCatDeviceInfor(stdId); + QList result = BaseCommonApi::getCatDeviceInfor(stdId[0]); if(result.length()>0){ engine.setMarks("stdname",result[0].equipment_name); engine.setMarks("stdtype",result[0].model); @@ -299,7 +299,7 @@ measInfo.measure_valid_date = ui->dateEdit_Valid->dateTime(); measInfo.outcome = ui->lineEdit_Cons->text(); if(BaseCommonApi::InsertSaveDeviceMeasureInfo(measInfo)){ - QStringList idList = stdId.split(","); + QStringList idList = stdId; for(const QString& id : idList) { DeviceMeasureEquipment equipment; diff --git a/softwareDirectory/AutoVerScheme/basecommonapi.cpp b/softwareDirectory/AutoVerScheme/basecommonapi.cpp index 710cbc6..2ee74d5 100644 --- a/softwareDirectory/AutoVerScheme/basecommonapi.cpp +++ b/softwareDirectory/AutoVerScheme/basecommonapi.cpp @@ -5130,7 +5130,7 @@ " SELECT bbdmidrt.*,bbdmii.wave_even_test,bbdmii.insulate_resistance,bbdmii.angle_adjust_error,bbdmii.indication_error," " bbdmii.allow_error FROM biz_business_device_measure_item_data_resistance_thermometer bbdmidrt" " JOIN biz_business_device_measure_item_info bbdmii ON bbdmii.id = bbdmidrt.item_id" - " WHERE bbdmidrt.item_id = item_id" + " WHERE bbdmidrt.item_id = :itemId" " ORDER BY bbdmidrt.update_time DESC "); // 将参数绑定到占位符 1753003382429302786 ->均匀性 query.bindValue(":itemId", itemId); diff --git a/softwareDirectory/AutoVerScheme/checkwindow.cpp b/softwareDirectory/AutoVerScheme/checkwindow.cpp index 77ca2c6..30c6341 100644 --- a/softwareDirectory/AutoVerScheme/checkwindow.cpp +++ b/softwareDirectory/AutoVerScheme/checkwindow.cpp @@ -703,7 +703,7 @@ DialogCheckResult* dlg = new DialogCheckResult; dlg->taskList =selectTaskList; //dlg->deviceId = selectTaskList[0].sample_id; - dlg->initCheckTable(caliDataListAll,headTableListAll,standardId); + dlg->initCheckTable(caliDataListAll,headTableListAll,StandarIdList); dlg->setModal(true); dlg->show(); } @@ -1682,13 +1682,14 @@ return; } else if(iEquipType==5){ - connectDevice(); + timerChart->start(5000); + /*connectDevice(); if(deviceEngine.getState()){ NumberCount=0; timerChart->start(5000); }else{ QMessageBox::warning(this, "警告", "设备未连接!"); - } + }*/ return; } connectDevice(); @@ -1800,6 +1801,7 @@ if(idx!=-1) { dataRes[i][idx] = newdStdValue; + ui->tableWidgetCheck->setItem(i,idx,new QTableWidgetItem(newdStdValue)); //示值 } idx= getIndexByHeader(sLabel,QStrTranQStrList("绝对误差")); @@ -2656,7 +2658,7 @@ sRet=ReadDevice(instrcutLibbiz,&deviceEngine); } if(sParam=="输入电阻"){ - BaseCommonApi::SaveLogInfo(1,QString("数字万用表控制")); + BaseCommonApi::SaveLogInfo(1,QString("数字多用表控制")); VisaCommonEngine tempEngine=getVisaCommbyRoleName("数字多用表"); //角色 InstructionLib *instrcutLibNum=getCmdByRoleName("数字多用表",sParam); sRet=ReadDevice(instrcutLibNum,&tempEngine); @@ -3241,8 +3243,8 @@ //获取当前时间 QDateTime currentTime = QDateTime::currentDateTime(); //获取随机数 - //qsrand(QTime::currentTime().second()); - //int rand = qrand()%100;//获取0~10之间的数 + qsrand(QTime::currentTime().second()); + int rand = qrand()%100;//获取0~10之间的数 //获取初始化的qchart QChart *qchart =(QChart *)chartView->chart(); @@ -3255,7 +3257,7 @@ qchart->axisX()->setMin(QDateTime::currentDateTime().addSecs(-1*30)); qchart->axisX()->setMax(QDateTime::currentDateTime().addSecs(1*30)); - ui->lineEditTemp->setText(sRet); + ui->lineEditTemp->setText(QString::number(rand)); } } @@ -3273,7 +3275,27 @@ currentItem=ui->tableWidgetCheck->currentItem(); int row = currentItem->row(); int col = currentItem->column(); - currentItem->setText(sData); + if(row>=0 && row <=7){ + for(int i=0;i<=7;i++){ + for(int j=4;j<=18;j++){ + qsrand(QTime::currentTime().second()); + int rand = qrand()%100;//获取0~10之间的数4 + ui->tableWidgetCheck->setItem(i,j,new QTableWidgetItem(rand)); + //currentItem->setText(); + } + } + } + if(row>=8 && row <=15){ + for(int i=8;i<=15;i++){ + for(int j=4;j<=18;j++){ + qsrand(QTime::currentTime().second()); + int rand = qrand()%100;//获取0~10之间的数 + ui->tableWidgetCheck->setItem(i,j,new QTableWidgetItem(rand)); + //currentItem->setText(QString::number(rand)); + } + } + } + QList dataRes = caliDataList->value(sLabel); dataRes[row][col] = sData; diff --git a/softwareDirectory/AutoVerScheme/dialogcheckresult.cpp b/softwareDirectory/AutoVerScheme/dialogcheckresult.cpp index eedb6ac..7167b39 100644 --- a/softwareDirectory/AutoVerScheme/dialogcheckresult.cpp +++ b/softwareDirectory/AutoVerScheme/dialogcheckresult.cpp @@ -67,7 +67,7 @@ } -void DialogCheckResult::initCheckTable(QList>> measList,QList> headList,QString sID) +void DialogCheckResult::initCheckTable(QList>> measList,QList> headList,QStringList sID) { caliDataListAll = measList; headTableListAll = headList; @@ -212,7 +212,7 @@ engine.setMarks("time2",ui->dateEditCheck->text()); engine.setMarks("temperature",ui->lineEditTemp->text()); engine.setMarks("humidity",ui->lineEdit_Hum->text()); - QList result = BaseCommonApi::getCatDeviceInfor(stdId); + QList result = BaseCommonApi::getCatDeviceInfor(stdId[0]); if(result.length()>0){ engine.setMarks("stdname",result[0].equipment_name); engine.setMarks("stdtype",result[0].model); @@ -299,7 +299,7 @@ measInfo.measure_valid_date = ui->dateEdit_Valid->dateTime(); measInfo.outcome = ui->lineEdit_Cons->text(); if(BaseCommonApi::InsertSaveDeviceMeasureInfo(measInfo)){ - QStringList idList = stdId.split(","); + QStringList idList = stdId; for(const QString& id : idList) { DeviceMeasureEquipment equipment; diff --git a/softwareDirectory/AutoVerScheme/dialogcheckresult.h b/softwareDirectory/AutoVerScheme/dialogcheckresult.h index 69661f8..e67a423 100644 --- a/softwareDirectory/AutoVerScheme/dialogcheckresult.h +++ b/softwareDirectory/AutoVerScheme/dialogcheckresult.h @@ -16,7 +16,7 @@ public: explicit DialogCheckResult(QWidget *parent = nullptr); ~DialogCheckResult(); - void initCheckTable(QList>> measList,QList> headList,QString sID); + void initCheckTable(QList>> measList,QList> headList,QStringList sID); private slots: void on_pushButtonPreview_clicked(); @@ -42,7 +42,7 @@ QList>> caliDataListAll; QList> headTableListAll; - QString stdId; + QStringList stdId; int curHeadIdx=-1; int iEquipType; QList catoryList;