diff --git a/softwareDirectory/AutoVerScheme/basecommonapi.cpp b/softwareDirectory/AutoVerScheme/basecommonapi.cpp index be399a9..f4a7d86 100644 --- a/softwareDirectory/AutoVerScheme/basecommonapi.cpp +++ b/softwareDirectory/AutoVerScheme/basecommonapi.cpp @@ -3301,14 +3301,33 @@ return DataMapList; } +QList BaseCommonApi::searchStatus(QString deviceId) +{ + QList result; + QList tableList = getJudgeCalibrationTable(deviceId); + QString itemId = tableList[0].id; + QString belongStandardEquipment = tableList[0].belong_standard_equipment; + switch (belongStandardEquipment.toInt()) { + case 1: + break; + case 2: + break; + case 4: + result = getDeviceMeasureCalibratorPistonGaugeBystatus(itemId); + break; + } + return result; +} //测试界面 外观及功能性检查和检定数据头 -DeviceMeasureCalibratorPistonGauge BaseCommonApi::getDeviceMeasureCalibratorPistonGaugeBystatus(QString itemId) +QList BaseCommonApi::getDeviceMeasureCalibratorPistonGaugeBystatus(QString itemId) { - DeviceMeasureCalibratorPistonGauge result; + QList result; QSqlQuery query; - query.prepare("SELECT bbdmii.appearance_function_check,bbdmicp.appearance,bbdmicp.tightness,bbdmicp.insulation_resistance,bbdmicp.zero_drift,bbdmicp.range_unit,bbdmicp.measure_medium " + QStringList strList; + query.prepare("SELECT bbdmii.appearance_function_check,bbdmicp.appearance,bbdmicp.tightness,bbdmicp.insulation_resistance," + " bbdmicp.zero_drift,bbdmicp.range_unit,bbdmidpg.measure_medium " " ,bbdmicp.division FROM biz_business_device_measure_item_data_piston_gauge bbdmidpg " " JOIN biz_business_device_measure_item_config_piston_gauge bbdmicp ON bbdmicp.item_id = bbdmidpg.item_id " " JOIN biz_business_device_measure_item_info bbdmii ON bbdmii.id = bbdmidpg.item_id" @@ -3317,15 +3336,25 @@ query.bindValue(":itemId", itemId); if (query.exec()) { while (query.next()) { - result.appearance_function_check = query.value("appearance_function_check").toString();//外观及功能性检查(1/0) - result.appearance = query.value("appearance").toString();//外观 - result.tightness= query.value("tightness").toString();//密封性 - result.insulation_resistance= query.value("insulation_resistance").toString();//绝缘电阻 - result.pointer_deflection_stability = query.value("pointer_deflection_stability").toString();//指针偏转平稳性 - result.zero_drift = query.value("zero_drift").toString();//零位飘移 - result.measure_medium = query.value("measure_medium").toString();//检定介质(字典value) - result.division = query.value("division").toString();//分度值的五分之一 + strList.append(query.value("appearance_function_check").toString());//外观及功能性检查(1/0) + strList.append(query.value("appearance").toString());//外观 + strList.append(query.value("tightness").toString());//密封性 + strList.append(query.value("insulation_resistance").toString());//绝缘电阻 + strList.append(query.value("zero_drift").toString());//零位飘移 + strList.append(query.value("pointer_deflection_stability").toString());//指针偏转平稳性 + strList.append(query.value("range_unit").toString());//单位 + strList.append(query.value("measure_medium").toString());//检定介质(字典value) + strList.append(query.value("division").toString());//分度值的五分之一 +// result.appearance_function_check = query.value("appearance_function_check").toString(); +// result.appearance = query.value("appearance").toString(); +// result.tightness= query.value("tightness").toString(); +// result.insulation_resistance= query.value("insulation_resistance").toString(); +// result.pointer_deflection_stability = query.value("pointer_deflection_stability").toString(); +// result.zero_drift = query.value("zero_drift").toString(); +// result.measure_medium = query.value("measure_medium").toString(); +// result.division = query.value("division").toString(); } + result.append(strList); } else { qDebug() << "Query execution failed: " << query.lastError().text(); } diff --git a/softwareDirectory/AutoVerScheme/basecommonapi.cpp b/softwareDirectory/AutoVerScheme/basecommonapi.cpp index be399a9..f4a7d86 100644 --- a/softwareDirectory/AutoVerScheme/basecommonapi.cpp +++ b/softwareDirectory/AutoVerScheme/basecommonapi.cpp @@ -3301,14 +3301,33 @@ return DataMapList; } +QList BaseCommonApi::searchStatus(QString deviceId) +{ + QList result; + QList tableList = getJudgeCalibrationTable(deviceId); + QString itemId = tableList[0].id; + QString belongStandardEquipment = tableList[0].belong_standard_equipment; + switch (belongStandardEquipment.toInt()) { + case 1: + break; + case 2: + break; + case 4: + result = getDeviceMeasureCalibratorPistonGaugeBystatus(itemId); + break; + } + return result; +} //测试界面 外观及功能性检查和检定数据头 -DeviceMeasureCalibratorPistonGauge BaseCommonApi::getDeviceMeasureCalibratorPistonGaugeBystatus(QString itemId) +QList BaseCommonApi::getDeviceMeasureCalibratorPistonGaugeBystatus(QString itemId) { - DeviceMeasureCalibratorPistonGauge result; + QList result; QSqlQuery query; - query.prepare("SELECT bbdmii.appearance_function_check,bbdmicp.appearance,bbdmicp.tightness,bbdmicp.insulation_resistance,bbdmicp.zero_drift,bbdmicp.range_unit,bbdmicp.measure_medium " + QStringList strList; + query.prepare("SELECT bbdmii.appearance_function_check,bbdmicp.appearance,bbdmicp.tightness,bbdmicp.insulation_resistance," + " bbdmicp.zero_drift,bbdmicp.range_unit,bbdmidpg.measure_medium " " ,bbdmicp.division FROM biz_business_device_measure_item_data_piston_gauge bbdmidpg " " JOIN biz_business_device_measure_item_config_piston_gauge bbdmicp ON bbdmicp.item_id = bbdmidpg.item_id " " JOIN biz_business_device_measure_item_info bbdmii ON bbdmii.id = bbdmidpg.item_id" @@ -3317,15 +3336,25 @@ query.bindValue(":itemId", itemId); if (query.exec()) { while (query.next()) { - result.appearance_function_check = query.value("appearance_function_check").toString();//外观及功能性检查(1/0) - result.appearance = query.value("appearance").toString();//外观 - result.tightness= query.value("tightness").toString();//密封性 - result.insulation_resistance= query.value("insulation_resistance").toString();//绝缘电阻 - result.pointer_deflection_stability = query.value("pointer_deflection_stability").toString();//指针偏转平稳性 - result.zero_drift = query.value("zero_drift").toString();//零位飘移 - result.measure_medium = query.value("measure_medium").toString();//检定介质(字典value) - result.division = query.value("division").toString();//分度值的五分之一 + strList.append(query.value("appearance_function_check").toString());//外观及功能性检查(1/0) + strList.append(query.value("appearance").toString());//外观 + strList.append(query.value("tightness").toString());//密封性 + strList.append(query.value("insulation_resistance").toString());//绝缘电阻 + strList.append(query.value("zero_drift").toString());//零位飘移 + strList.append(query.value("pointer_deflection_stability").toString());//指针偏转平稳性 + strList.append(query.value("range_unit").toString());//单位 + strList.append(query.value("measure_medium").toString());//检定介质(字典value) + strList.append(query.value("division").toString());//分度值的五分之一 +// result.appearance_function_check = query.value("appearance_function_check").toString(); +// result.appearance = query.value("appearance").toString(); +// result.tightness= query.value("tightness").toString(); +// result.insulation_resistance= query.value("insulation_resistance").toString(); +// result.pointer_deflection_stability = query.value("pointer_deflection_stability").toString(); +// result.zero_drift = query.value("zero_drift").toString(); +// result.measure_medium = query.value("measure_medium").toString(); +// result.division = query.value("division").toString(); } + result.append(strList); } else { qDebug() << "Query execution failed: " << query.lastError().text(); } diff --git a/softwareDirectory/AutoVerScheme/basecommonapi.h b/softwareDirectory/AutoVerScheme/basecommonapi.h index c72d477..fb3bed8 100644 --- a/softwareDirectory/AutoVerScheme/basecommonapi.h +++ b/softwareDirectory/AutoVerScheme/basecommonapi.h @@ -1427,8 +1427,13 @@ static QMap> GetDataReturnItemListByPistonGaugeResult(QString itemCatoryName,QList ResultData,QMap> DataMapList,QMap *HeadMapList); //【结果保存】压力 static bool InsertDeviceMeasureDataPistonGauge(DeviceMeasureDataPistonGauge gauge); + + static QList searchStatus(QString deviceId); + + + //测试页面 压力 外观及功能性检查和检定数据头 - static DeviceMeasureCalibratorPistonGauge getDeviceMeasureCalibratorPistonGaugeBystatus(QString itemId); + static QList getDeviceMeasureCalibratorPistonGaugeBystatus(QString itemId); // 【查询】检定项直流稳压电源 static QMap> getDeviceMeasureItemDataDcPower(QString itemCatoryName,QString itemId,QMap *headList); static QMap> GetDataReturnItemListByDcPower(QString itemCatoryName,QList ResultData,QMap> DataMapList,QMap *HeadMapList); diff --git a/softwareDirectory/AutoVerScheme/basecommonapi.cpp b/softwareDirectory/AutoVerScheme/basecommonapi.cpp index be399a9..f4a7d86 100644 --- a/softwareDirectory/AutoVerScheme/basecommonapi.cpp +++ b/softwareDirectory/AutoVerScheme/basecommonapi.cpp @@ -3301,14 +3301,33 @@ return DataMapList; } +QList BaseCommonApi::searchStatus(QString deviceId) +{ + QList result; + QList tableList = getJudgeCalibrationTable(deviceId); + QString itemId = tableList[0].id; + QString belongStandardEquipment = tableList[0].belong_standard_equipment; + switch (belongStandardEquipment.toInt()) { + case 1: + break; + case 2: + break; + case 4: + result = getDeviceMeasureCalibratorPistonGaugeBystatus(itemId); + break; + } + return result; +} //测试界面 外观及功能性检查和检定数据头 -DeviceMeasureCalibratorPistonGauge BaseCommonApi::getDeviceMeasureCalibratorPistonGaugeBystatus(QString itemId) +QList BaseCommonApi::getDeviceMeasureCalibratorPistonGaugeBystatus(QString itemId) { - DeviceMeasureCalibratorPistonGauge result; + QList result; QSqlQuery query; - query.prepare("SELECT bbdmii.appearance_function_check,bbdmicp.appearance,bbdmicp.tightness,bbdmicp.insulation_resistance,bbdmicp.zero_drift,bbdmicp.range_unit,bbdmicp.measure_medium " + QStringList strList; + query.prepare("SELECT bbdmii.appearance_function_check,bbdmicp.appearance,bbdmicp.tightness,bbdmicp.insulation_resistance," + " bbdmicp.zero_drift,bbdmicp.range_unit,bbdmidpg.measure_medium " " ,bbdmicp.division FROM biz_business_device_measure_item_data_piston_gauge bbdmidpg " " JOIN biz_business_device_measure_item_config_piston_gauge bbdmicp ON bbdmicp.item_id = bbdmidpg.item_id " " JOIN biz_business_device_measure_item_info bbdmii ON bbdmii.id = bbdmidpg.item_id" @@ -3317,15 +3336,25 @@ query.bindValue(":itemId", itemId); if (query.exec()) { while (query.next()) { - result.appearance_function_check = query.value("appearance_function_check").toString();//外观及功能性检查(1/0) - result.appearance = query.value("appearance").toString();//外观 - result.tightness= query.value("tightness").toString();//密封性 - result.insulation_resistance= query.value("insulation_resistance").toString();//绝缘电阻 - result.pointer_deflection_stability = query.value("pointer_deflection_stability").toString();//指针偏转平稳性 - result.zero_drift = query.value("zero_drift").toString();//零位飘移 - result.measure_medium = query.value("measure_medium").toString();//检定介质(字典value) - result.division = query.value("division").toString();//分度值的五分之一 + strList.append(query.value("appearance_function_check").toString());//外观及功能性检查(1/0) + strList.append(query.value("appearance").toString());//外观 + strList.append(query.value("tightness").toString());//密封性 + strList.append(query.value("insulation_resistance").toString());//绝缘电阻 + strList.append(query.value("zero_drift").toString());//零位飘移 + strList.append(query.value("pointer_deflection_stability").toString());//指针偏转平稳性 + strList.append(query.value("range_unit").toString());//单位 + strList.append(query.value("measure_medium").toString());//检定介质(字典value) + strList.append(query.value("division").toString());//分度值的五分之一 +// result.appearance_function_check = query.value("appearance_function_check").toString(); +// result.appearance = query.value("appearance").toString(); +// result.tightness= query.value("tightness").toString(); +// result.insulation_resistance= query.value("insulation_resistance").toString(); +// result.pointer_deflection_stability = query.value("pointer_deflection_stability").toString(); +// result.zero_drift = query.value("zero_drift").toString(); +// result.measure_medium = query.value("measure_medium").toString(); +// result.division = query.value("division").toString(); } + result.append(strList); } else { qDebug() << "Query execution failed: " << query.lastError().text(); } diff --git a/softwareDirectory/AutoVerScheme/basecommonapi.h b/softwareDirectory/AutoVerScheme/basecommonapi.h index c72d477..fb3bed8 100644 --- a/softwareDirectory/AutoVerScheme/basecommonapi.h +++ b/softwareDirectory/AutoVerScheme/basecommonapi.h @@ -1427,8 +1427,13 @@ static QMap> GetDataReturnItemListByPistonGaugeResult(QString itemCatoryName,QList ResultData,QMap> DataMapList,QMap *HeadMapList); //【结果保存】压力 static bool InsertDeviceMeasureDataPistonGauge(DeviceMeasureDataPistonGauge gauge); + + static QList searchStatus(QString deviceId); + + + //测试页面 压力 外观及功能性检查和检定数据头 - static DeviceMeasureCalibratorPistonGauge getDeviceMeasureCalibratorPistonGaugeBystatus(QString itemId); + static QList getDeviceMeasureCalibratorPistonGaugeBystatus(QString itemId); // 【查询】检定项直流稳压电源 static QMap> getDeviceMeasureItemDataDcPower(QString itemCatoryName,QString itemId,QMap *headList); static QMap> GetDataReturnItemListByDcPower(QString itemCatoryName,QList ResultData,QMap> DataMapList,QMap *HeadMapList); diff --git a/softwareDirectory/AutoVerScheme/checkwindow.cpp b/softwareDirectory/AutoVerScheme/checkwindow.cpp index 6750f11..b2a1735 100644 --- a/softwareDirectory/AutoVerScheme/checkwindow.cpp +++ b/softwareDirectory/AutoVerScheme/checkwindow.cpp @@ -385,7 +385,7 @@ return;}; //tableWidgetItem QList calData = caliDataList.values().first(); - gaugeInfo = BaseCommonApi::getDeviceMeasureCalibratorPistonGaugeBystatus(calData[0][0]); + gaugeInfo = BaseCommonApi::searchStatus(deviceId); ui->tableWidget_Point->clearContents(); ui->tableWidget_Point->setRowCount(0); deleteItem(ui->HeadListLayout); @@ -437,9 +437,9 @@ QPushButton *button = new QPushButton(sLabel, this); //设置样式 // 设置按钮大小为 56x20 - //button->setFixedSize(85, 40); - button->setCheckable(true); - button->setAutoExclusive(true); + button->setFixedSize(85, 40); + button->setCheckable(true); + button->setAutoExclusive(true); //设置第一个按钮选中状态 if(index==0){ button->setChecked(true);} //button->setc(true); @@ -448,6 +448,8 @@ "border: 1px solid white;" // 白色边框 "border-bottom: 2px solid rgba(0, 255, 255, 1);" // 浅蓝色下划线 "background-color: rgba(242, 242, 242, 1);" // 浅灰色背景 + "height:40px;" + "padding:5px;" "}" "QPushButton:hover {" "background-color: rgba(215, 215, 215, 1);;" // 鼠标悬停时变为深灰色背景 @@ -465,26 +467,33 @@ pageButtons.append(button); ++index; } + QStringList info = gaugeInfo[0]; + ui->HeadListLayout->addStretch(); if(iEquipType==4){ QLabel* label = new QLabel(this); label->setText("单位："); ui->HeadListLayout->addWidget(label); + QLineEdit* edit1 = new QLineEdit(this); + edit1->setFixedWidth(100); + edit1->setText(info.at(6)); + ui->HeadListLayout->addWidget(edit1); QLabel* label2 = new QLabel(this); label2->setText("检定介质"); ui->HeadListLayout->addWidget(label2); QComboBox* combox = new QComboBox(this); - combox->addItem("氮气"); - combox->addItem("变压器油"); - combox->addItem("空气"); - combox->addItem("水"); - combox->addItem("其他"); + combox->addItem(info.at(7)); +// combox->addItem("变压器油"); +// combox->addItem("空气"); +// combox->addItem("水"); +// combox->addItem("其他"); ui->HeadListLayout->addWidget(combox); QLabel* label3 = new QLabel(this); label3->setText("分度值的1/5："); ui->HeadListLayout->addWidget(label3); QLineEdit* edit = new QLineEdit(this); edit->setFixedWidth(100); + edit->setText(info.at(8)); ui->HeadListLayout->addWidget(edit); QPushButton *button = new QPushButton("生成结果处理", this); button->setStyleSheet("QPushButton {" diff --git a/softwareDirectory/AutoVerScheme/basecommonapi.cpp b/softwareDirectory/AutoVerScheme/basecommonapi.cpp index be399a9..f4a7d86 100644 --- a/softwareDirectory/AutoVerScheme/basecommonapi.cpp +++ b/softwareDirectory/AutoVerScheme/basecommonapi.cpp @@ -3301,14 +3301,33 @@ return DataMapList; } +QList BaseCommonApi::searchStatus(QString deviceId) +{ + QList result; + QList tableList = getJudgeCalibrationTable(deviceId); + QString itemId = tableList[0].id; + QString belongStandardEquipment = tableList[0].belong_standard_equipment; + switch (belongStandardEquipment.toInt()) { + case 1: + break; + case 2: + break; + case 4: + result = getDeviceMeasureCalibratorPistonGaugeBystatus(itemId); + break; + } + return result; +} //测试界面 外观及功能性检查和检定数据头 -DeviceMeasureCalibratorPistonGauge BaseCommonApi::getDeviceMeasureCalibratorPistonGaugeBystatus(QString itemId) +QList BaseCommonApi::getDeviceMeasureCalibratorPistonGaugeBystatus(QString itemId) { - DeviceMeasureCalibratorPistonGauge result; + QList result; QSqlQuery query; - query.prepare("SELECT bbdmii.appearance_function_check,bbdmicp.appearance,bbdmicp.tightness,bbdmicp.insulation_resistance,bbdmicp.zero_drift,bbdmicp.range_unit,bbdmicp.measure_medium " + QStringList strList; + query.prepare("SELECT bbdmii.appearance_function_check,bbdmicp.appearance,bbdmicp.tightness,bbdmicp.insulation_resistance," + " bbdmicp.zero_drift,bbdmicp.range_unit,bbdmidpg.measure_medium " " ,bbdmicp.division FROM biz_business_device_measure_item_data_piston_gauge bbdmidpg " " JOIN biz_business_device_measure_item_config_piston_gauge bbdmicp ON bbdmicp.item_id = bbdmidpg.item_id " " JOIN biz_business_device_measure_item_info bbdmii ON bbdmii.id = bbdmidpg.item_id" @@ -3317,15 +3336,25 @@ query.bindValue(":itemId", itemId); if (query.exec()) { while (query.next()) { - result.appearance_function_check = query.value("appearance_function_check").toString();//外观及功能性检查(1/0) - result.appearance = query.value("appearance").toString();//外观 - result.tightness= query.value("tightness").toString();//密封性 - result.insulation_resistance= query.value("insulation_resistance").toString();//绝缘电阻 - result.pointer_deflection_stability = query.value("pointer_deflection_stability").toString();//指针偏转平稳性 - result.zero_drift = query.value("zero_drift").toString();//零位飘移 - result.measure_medium = query.value("measure_medium").toString();//检定介质(字典value) - result.division = query.value("division").toString();//分度值的五分之一 + strList.append(query.value("appearance_function_check").toString());//外观及功能性检查(1/0) + strList.append(query.value("appearance").toString());//外观 + strList.append(query.value("tightness").toString());//密封性 + strList.append(query.value("insulation_resistance").toString());//绝缘电阻 + strList.append(query.value("zero_drift").toString());//零位飘移 + strList.append(query.value("pointer_deflection_stability").toString());//指针偏转平稳性 + strList.append(query.value("range_unit").toString());//单位 + strList.append(query.value("measure_medium").toString());//检定介质(字典value) + strList.append(query.value("division").toString());//分度值的五分之一 +// result.appearance_function_check = query.value("appearance_function_check").toString(); +// result.appearance = query.value("appearance").toString(); +// result.tightness= query.value("tightness").toString(); +// result.insulation_resistance= query.value("insulation_resistance").toString(); +// result.pointer_deflection_stability = query.value("pointer_deflection_stability").toString(); +// result.zero_drift = query.value("zero_drift").toString(); +// result.measure_medium = query.value("measure_medium").toString(); +// result.division = query.value("division").toString(); } + result.append(strList); } else { qDebug() << "Query execution failed: " << query.lastError().text(); } diff --git a/softwareDirectory/AutoVerScheme/basecommonapi.h b/softwareDirectory/AutoVerScheme/basecommonapi.h index c72d477..fb3bed8 100644 --- a/softwareDirectory/AutoVerScheme/basecommonapi.h +++ b/softwareDirectory/AutoVerScheme/basecommonapi.h @@ -1427,8 +1427,13 @@ static QMap> GetDataReturnItemListByPistonGaugeResult(QString itemCatoryName,QList ResultData,QMap> DataMapList,QMap *HeadMapList); //【结果保存】压力 static bool InsertDeviceMeasureDataPistonGauge(DeviceMeasureDataPistonGauge gauge); + + static QList searchStatus(QString deviceId); + + + //测试页面 压力 外观及功能性检查和检定数据头 - static DeviceMeasureCalibratorPistonGauge getDeviceMeasureCalibratorPistonGaugeBystatus(QString itemId); + static QList getDeviceMeasureCalibratorPistonGaugeBystatus(QString itemId); // 【查询】检定项直流稳压电源 static QMap> getDeviceMeasureItemDataDcPower(QString itemCatoryName,QString itemId,QMap *headList); static QMap> GetDataReturnItemListByDcPower(QString itemCatoryName,QList ResultData,QMap> DataMapList,QMap *HeadMapList); diff --git a/softwareDirectory/AutoVerScheme/checkwindow.cpp b/softwareDirectory/AutoVerScheme/checkwindow.cpp index 6750f11..b2a1735 100644 --- a/softwareDirectory/AutoVerScheme/checkwindow.cpp +++ b/softwareDirectory/AutoVerScheme/checkwindow.cpp @@ -385,7 +385,7 @@ return;}; //tableWidgetItem QList calData = caliDataList.values().first(); - gaugeInfo = BaseCommonApi::getDeviceMeasureCalibratorPistonGaugeBystatus(calData[0][0]); + gaugeInfo = BaseCommonApi::searchStatus(deviceId); ui->tableWidget_Point->clearContents(); ui->tableWidget_Point->setRowCount(0); deleteItem(ui->HeadListLayout); @@ -437,9 +437,9 @@ QPushButton *button = new QPushButton(sLabel, this); //设置样式 // 设置按钮大小为 56x20 - //button->setFixedSize(85, 40); - button->setCheckable(true); - button->setAutoExclusive(true); + button->setFixedSize(85, 40); + button->setCheckable(true); + button->setAutoExclusive(true); //设置第一个按钮选中状态 if(index==0){ button->setChecked(true);} //button->setc(true); @@ -448,6 +448,8 @@ "border: 1px solid white;" // 白色边框 "border-bottom: 2px solid rgba(0, 255, 255, 1);" // 浅蓝色下划线 "background-color: rgba(242, 242, 242, 1);" // 浅灰色背景 + "height:40px;" + "padding:5px;" "}" "QPushButton:hover {" "background-color: rgba(215, 215, 215, 1);;" // 鼠标悬停时变为深灰色背景 @@ -465,26 +467,33 @@ pageButtons.append(button); ++index; } + QStringList info = gaugeInfo[0]; + ui->HeadListLayout->addStretch(); if(iEquipType==4){ QLabel* label = new QLabel(this); label->setText("单位："); ui->HeadListLayout->addWidget(label); + QLineEdit* edit1 = new QLineEdit(this); + edit1->setFixedWidth(100); + edit1->setText(info.at(6)); + ui->HeadListLayout->addWidget(edit1); QLabel* label2 = new QLabel(this); label2->setText("检定介质"); ui->HeadListLayout->addWidget(label2); QComboBox* combox = new QComboBox(this); - combox->addItem("氮气"); - combox->addItem("变压器油"); - combox->addItem("空气"); - combox->addItem("水"); - combox->addItem("其他"); + combox->addItem(info.at(7)); +// combox->addItem("变压器油"); +// combox->addItem("空气"); +// combox->addItem("水"); +// combox->addItem("其他"); ui->HeadListLayout->addWidget(combox); QLabel* label3 = new QLabel(this); label3->setText("分度值的1/5："); ui->HeadListLayout->addWidget(label3); QLineEdit* edit = new QLineEdit(this); edit->setFixedWidth(100); + edit->setText(info.at(8)); ui->HeadListLayout->addWidget(edit); QPushButton *button = new QPushButton("生成结果处理", this); button->setStyleSheet("QPushButton {" diff --git a/softwareDirectory/AutoVerScheme/checkwindow.h b/softwareDirectory/AutoVerScheme/checkwindow.h index 432e3da..5dacafa 100644 --- a/softwareDirectory/AutoVerScheme/checkwindow.h +++ b/softwareDirectory/AutoVerScheme/checkwindow.h @@ -121,7 +121,7 @@ int currConnectIdx; QList pageButtons; QList chList; - DeviceMeasureCalibratorPistonGauge gaugeInfo; + QList gaugeInfo; }; #endif // CHECKWINDOW_H diff --git a/softwareDirectory/AutoVerScheme/basecommonapi.cpp b/softwareDirectory/AutoVerScheme/basecommonapi.cpp index be399a9..f4a7d86 100644 --- a/softwareDirectory/AutoVerScheme/basecommonapi.cpp +++ b/softwareDirectory/AutoVerScheme/basecommonapi.cpp @@ -3301,14 +3301,33 @@ return DataMapList; } +QList BaseCommonApi::searchStatus(QString deviceId) +{ + QList result; + QList tableList = getJudgeCalibrationTable(deviceId); + QString itemId = tableList[0].id; + QString belongStandardEquipment = tableList[0].belong_standard_equipment; + switch (belongStandardEquipment.toInt()) { + case 1: + break; + case 2: + break; + case 4: + result = getDeviceMeasureCalibratorPistonGaugeBystatus(itemId); + break; + } + return result; +} //测试界面 外观及功能性检查和检定数据头 -DeviceMeasureCalibratorPistonGauge BaseCommonApi::getDeviceMeasureCalibratorPistonGaugeBystatus(QString itemId) +QList BaseCommonApi::getDeviceMeasureCalibratorPistonGaugeBystatus(QString itemId) { - DeviceMeasureCalibratorPistonGauge result; + QList result; QSqlQuery query; - query.prepare("SELECT bbdmii.appearance_function_check,bbdmicp.appearance,bbdmicp.tightness,bbdmicp.insulation_resistance,bbdmicp.zero_drift,bbdmicp.range_unit,bbdmicp.measure_medium " + QStringList strList; + query.prepare("SELECT bbdmii.appearance_function_check,bbdmicp.appearance,bbdmicp.tightness,bbdmicp.insulation_resistance," + " bbdmicp.zero_drift,bbdmicp.range_unit,bbdmidpg.measure_medium " " ,bbdmicp.division FROM biz_business_device_measure_item_data_piston_gauge bbdmidpg " " JOIN biz_business_device_measure_item_config_piston_gauge bbdmicp ON bbdmicp.item_id = bbdmidpg.item_id " " JOIN biz_business_device_measure_item_info bbdmii ON bbdmii.id = bbdmidpg.item_id" @@ -3317,15 +3336,25 @@ query.bindValue(":itemId", itemId); if (query.exec()) { while (query.next()) { - result.appearance_function_check = query.value("appearance_function_check").toString();//外观及功能性检查(1/0) - result.appearance = query.value("appearance").toString();//外观 - result.tightness= query.value("tightness").toString();//密封性 - result.insulation_resistance= query.value("insulation_resistance").toString();//绝缘电阻 - result.pointer_deflection_stability = query.value("pointer_deflection_stability").toString();//指针偏转平稳性 - result.zero_drift = query.value("zero_drift").toString();//零位飘移 - result.measure_medium = query.value("measure_medium").toString();//检定介质(字典value) - result.division = query.value("division").toString();//分度值的五分之一 + strList.append(query.value("appearance_function_check").toString());//外观及功能性检查(1/0) + strList.append(query.value("appearance").toString());//外观 + strList.append(query.value("tightness").toString());//密封性 + strList.append(query.value("insulation_resistance").toString());//绝缘电阻 + strList.append(query.value("zero_drift").toString());//零位飘移 + strList.append(query.value("pointer_deflection_stability").toString());//指针偏转平稳性 + strList.append(query.value("range_unit").toString());//单位 + strList.append(query.value("measure_medium").toString());//检定介质(字典value) + strList.append(query.value("division").toString());//分度值的五分之一 +// result.appearance_function_check = query.value("appearance_function_check").toString(); +// result.appearance = query.value("appearance").toString(); +// result.tightness= query.value("tightness").toString(); +// result.insulation_resistance= query.value("insulation_resistance").toString(); +// result.pointer_deflection_stability = query.value("pointer_deflection_stability").toString(); +// result.zero_drift = query.value("zero_drift").toString(); +// result.measure_medium = query.value("measure_medium").toString(); +// result.division = query.value("division").toString(); } + result.append(strList); } else { qDebug() << "Query execution failed: " << query.lastError().text(); } diff --git a/softwareDirectory/AutoVerScheme/basecommonapi.h b/softwareDirectory/AutoVerScheme/basecommonapi.h index c72d477..fb3bed8 100644 --- a/softwareDirectory/AutoVerScheme/basecommonapi.h +++ b/softwareDirectory/AutoVerScheme/basecommonapi.h @@ -1427,8 +1427,13 @@ static QMap> GetDataReturnItemListByPistonGaugeResult(QString itemCatoryName,QList ResultData,QMap> DataMapList,QMap *HeadMapList); //【结果保存】压力 static bool InsertDeviceMeasureDataPistonGauge(DeviceMeasureDataPistonGauge gauge); + + static QList searchStatus(QString deviceId); + + + //测试页面 压力 外观及功能性检查和检定数据头 - static DeviceMeasureCalibratorPistonGauge getDeviceMeasureCalibratorPistonGaugeBystatus(QString itemId); + static QList getDeviceMeasureCalibratorPistonGaugeBystatus(QString itemId); // 【查询】检定项直流稳压电源 static QMap> getDeviceMeasureItemDataDcPower(QString itemCatoryName,QString itemId,QMap *headList); static QMap> GetDataReturnItemListByDcPower(QString itemCatoryName,QList ResultData,QMap> DataMapList,QMap *HeadMapList); diff --git a/softwareDirectory/AutoVerScheme/checkwindow.cpp b/softwareDirectory/AutoVerScheme/checkwindow.cpp index 6750f11..b2a1735 100644 --- a/softwareDirectory/AutoVerScheme/checkwindow.cpp +++ b/softwareDirectory/AutoVerScheme/checkwindow.cpp @@ -385,7 +385,7 @@ return;}; //tableWidgetItem QList calData = caliDataList.values().first(); - gaugeInfo = BaseCommonApi::getDeviceMeasureCalibratorPistonGaugeBystatus(calData[0][0]); + gaugeInfo = BaseCommonApi::searchStatus(deviceId); ui->tableWidget_Point->clearContents(); ui->tableWidget_Point->setRowCount(0); deleteItem(ui->HeadListLayout); @@ -437,9 +437,9 @@ QPushButton *button = new QPushButton(sLabel, this); //设置样式 // 设置按钮大小为 56x20 - //button->setFixedSize(85, 40); - button->setCheckable(true); - button->setAutoExclusive(true); + button->setFixedSize(85, 40); + button->setCheckable(true); + button->setAutoExclusive(true); //设置第一个按钮选中状态 if(index==0){ button->setChecked(true);} //button->setc(true); @@ -448,6 +448,8 @@ "border: 1px solid white;" // 白色边框 "border-bottom: 2px solid rgba(0, 255, 255, 1);" // 浅蓝色下划线 "background-color: rgba(242, 242, 242, 1);" // 浅灰色背景 + "height:40px;" + "padding:5px;" "}" "QPushButton:hover {" "background-color: rgba(215, 215, 215, 1);;" // 鼠标悬停时变为深灰色背景 @@ -465,26 +467,33 @@ pageButtons.append(button); ++index; } + QStringList info = gaugeInfo[0]; + ui->HeadListLayout->addStretch(); if(iEquipType==4){ QLabel* label = new QLabel(this); label->setText("单位："); ui->HeadListLayout->addWidget(label); + QLineEdit* edit1 = new QLineEdit(this); + edit1->setFixedWidth(100); + edit1->setText(info.at(6)); + ui->HeadListLayout->addWidget(edit1); QLabel* label2 = new QLabel(this); label2->setText("检定介质"); ui->HeadListLayout->addWidget(label2); QComboBox* combox = new QComboBox(this); - combox->addItem("氮气"); - combox->addItem("变压器油"); - combox->addItem("空气"); - combox->addItem("水"); - combox->addItem("其他"); + combox->addItem(info.at(7)); +// combox->addItem("变压器油"); +// combox->addItem("空气"); +// combox->addItem("水"); +// combox->addItem("其他"); ui->HeadListLayout->addWidget(combox); QLabel* label3 = new QLabel(this); label3->setText("分度值的1/5："); ui->HeadListLayout->addWidget(label3); QLineEdit* edit = new QLineEdit(this); edit->setFixedWidth(100); + edit->setText(info.at(8)); ui->HeadListLayout->addWidget(edit); QPushButton *button = new QPushButton("生成结果处理", this); button->setStyleSheet("QPushButton {" diff --git a/softwareDirectory/AutoVerScheme/checkwindow.h b/softwareDirectory/AutoVerScheme/checkwindow.h index 432e3da..5dacafa 100644 --- a/softwareDirectory/AutoVerScheme/checkwindow.h +++ b/softwareDirectory/AutoVerScheme/checkwindow.h @@ -121,7 +121,7 @@ int currConnectIdx; QList pageButtons; QList chList; - DeviceMeasureCalibratorPistonGauge gaugeInfo; + QList gaugeInfo; }; #endif // CHECKWINDOW_H diff --git a/softwareDirectory/AutoVerScheme/checkwindow.ui b/softwareDirectory/AutoVerScheme/checkwindow.ui index 8537841..1ed01df 100644 --- a/softwareDirectory/AutoVerScheme/checkwindow.ui +++ b/softwareDirectory/AutoVerScheme/checkwindow.ui @@ -1805,9 +1805,6 @@ - - 12 - @@ -2014,7 +2011,24 @@ - + + + + + + + + Qt::Horizontal + + + + 40 + 20 + + + + +