diff --git a/softwareDirectory/AutoVerScheme/basecommonapi.cpp b/softwareDirectory/AutoVerScheme/basecommonapi.cpp index 6baf8c1..a5251b2 100644 --- a/softwareDirectory/AutoVerScheme/basecommonapi.cpp +++ b/softwareDirectory/AutoVerScheme/basecommonapi.cpp @@ -4444,12 +4444,12 @@ QSqlQuery query; query.prepare( - "SELECT bbdmidrt.*,bbdmii.wave_even_test,bbdmii.insulate_resistance,bbdmii.angle_adjust_error,bbdmii.indication_error," + " 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 = :itemId" + " WHERE bbdmidrt.item_id = item_id" " ORDER BY bbdmidrt.update_time DESC "); - // 将参数绑定到占位符 + // 将参数绑定到占位符 1753003382429302786 ->均匀性 query.bindValue(":itemId", itemId); if (query.exec()) { while (query.next()) { @@ -4506,12 +4506,13 @@ { QString VerificationItem=NULL; bool showUpperLimit = false; + int num = 0; for(int i =0;i<16;i++){ if (!row.isEmpty() && row[27]=="1" && row[2] == "1") { VerificationItem = "波动性测试"; //添加列头 QStringList head; - head <<"序号"<< (showUpperLimit ? "上限点" : "")<<(showUpperLimit ? "下限点" : "")<<"单位"<<"示值1"<<"示值2"<<"示值3"<<"示值4"<<"示值5" + head <<"序号"<< "上限点" <<"下限点" <<"单位"<<"示值1"<<"示值2"<<"示值3"<<"示值4"<<"示值5" <<"示值6"<<"示值7"<<"示值8"<<"示值9"<<"示值10"<<"示值11"<<"示值12"<<"示值13"<<"示值14"<<"示值15" <<"最大值"<<"最小值"<<"波动性" ; HeadMapList->insert(VerificationItem,head); @@ -4539,27 +4540,26 @@ Data.append("");//最小值 Data.append("");//波动性 VolatilityList.append(Data); - if (i >= 7) { - showUpperLimit = true; - } - } - } - break; - if(!row.isEmpty() && row[27]=="1" && row[2] =="2"){ + + }else if(!row.isEmpty() && row[27]=="1" && row[2] =="2"){ + int d_num = 1; + d_num = showUpperLimit ? num++ : i; + QChar character('A' + d_num); VerificationItem = "均匀性测试"; //添加列头 QStringList head; - head <<"序号"<<"单位"<<"上限点"<<"下限点"<<"位置" + head <<"序号"<<"单位"<<"下限点"<<"上限点"<<"位置" <<"示值ROA1"<<"示值RA1"<<"RA2"<<"ROA2"<<"ROA3"<<"RA3"<<"RA4"<<"ROA4"<<"ROA均值"<<"RA均值"<<"上水平面温差" <<"下水平面温差"<<"水平最大温差"<<"工作区域最大温差"; HeadMapList->insert(VerificationItem,head); //添加数据 QStringList Data; + Data.append(row[0]); //ID Data.append(row[3]); //单位 - Data.append(row[4]);//上限点 - Data.append(row[5]);//下限点 - Data.append("");//位置 + Data.append(showUpperLimit ? "": row[5]);//下限点 + Data.append(showUpperLimit ? row[4] : ""); // 上限点 + Data.append(character);//位置 Data.append("");//示值ROA1 Data.append("");//示值RA1 Data.append("");//RA2 @@ -4576,9 +4576,11 @@ Data.append("");//工作区域最大温差 UniformityList.append(Data); } - + if (i >= 7) { + showUpperLimit = true; + } } - + } } if(VolatilityList.count()!=0){ DataMapList.insert("波动性测试",VolatilityList);