diff --git a/softwareDirectory/AutoVerScheme/basecommonapi.cpp b/softwareDirectory/AutoVerScheme/basecommonapi.cpp index f3cc207..6baf8c1 100644 --- a/softwareDirectory/AutoVerScheme/basecommonapi.cpp +++ b/softwareDirectory/AutoVerScheme/basecommonapi.cpp @@ -914,6 +914,7 @@ case 5: //二等铂电阻温度计标准装置 DataList=BaseCommonApi::getDeviceMeasureItemDataResistanceThermometer(deviceCatoryName,CliTable[0].id,HeadList); + break; case 9: //频谱分析仪装置 DataList=BaseCommonApi::getDeviceMeasureItemDataSpectrumAnalyzer(deviceCatoryName,CliTable[0].id,HeadList); @@ -4504,19 +4505,21 @@ for(const QStringList &row : ResultData) { QString VerificationItem=NULL; + bool showUpperLimit = false; + for(int i =0;i<16;i++){ if (!row.isEmpty() && row[27]=="1" && row[2] == "1") { VerificationItem = "波动性测试"; //添加列头 QStringList head; - head <<"序号"<<"上限点"<<"下限点"<<"单位"<<"示值1"<<"示值2"<<"示值3"<<"示值4"<<"示值5" + head <<"序号"<< (showUpperLimit ? "上限点" : "")<<(showUpperLimit ? "下限点" : "")<<"单位"<<"示值1"<<"示值2"<<"示值3"<<"示值4"<<"示值5" <<"示值6"<<"示值7"<<"示值8"<<"示值9"<<"示值10"<<"示值11"<<"示值12"<<"示值13"<<"示值14"<<"示值15" <<"最大值"<<"最小值"<<"波动性" ; HeadMapList->insert(VerificationItem,head); //添加数据 QStringList Data; Data.append(row[0]); //ID - Data.append(row[4]); //上限点 - Data.append(row[5]);//下限点 + Data.append(showUpperLimit ? row[4] : ""); // 上限点 + Data.append(showUpperLimit ? "": row[5]);//下限点 Data.append(row[3]);//单位 Data.append("");//示值1 Data.append("");//示值2 @@ -4536,7 +4539,13 @@ Data.append("");//最小值 Data.append("");//波动性 VolatilityList.append(Data); - }else if(!row.isEmpty() && row[27]=="1" && row[2] =="2"){ + if (i >= 7) { + showUpperLimit = true; + } + } + } + break; + if(!row.isEmpty() && row[27]=="1" && row[2] =="2"){ VerificationItem = "均匀性测试"; //添加列头 QStringList head; @@ -4569,6 +4578,7 @@ } } + } if(VolatilityList.count()!=0){ DataMapList.insert("波动性测试",VolatilityList); @@ -4578,6 +4588,29 @@ }; return DataMapList; } + +QMap> GetDataReturnItemListByResistanceThermometerToVolatility(QString itemCatoryName,QList ResultData,QMap> DataMapList,QMap *HeadMapList) +{ + QList UpperList; + QList LowerList; + for(const QStringList &row : ResultData) + for(int i =0;i<8;i++){ + { + QString VerificationItem=NULL; + VerificationItem = "波动性测试"; + //添加列头 + QStringList head; + head <<"序号"<<"下限点"<<"单位"<<"示值1"<<"示值2"<<"示值3"<<"示值4"<<"示值5" + <<"示值6"<<"示值7"<<"示值8"<<"示值9"<<"示值10"<<"示值11"<<"示值12"<<"示值13"<<"示值14"<<"示值15" + <<"最大值"<<"最小值"<<"波动性" ; + HeadMapList->insert(VerificationItem,head); + //添加数据 + QStringList Data; + } + } +} + + //结果保存-二等铂电阻 bool BaseCommonApi::InsertDeviceMeasureDataResistanceThermometer(DeviceMeasureDataResistanceThermometer thermometer) {