diff --git a/softwareDirectory/AutoVerScheme/basecommonapi.cpp b/softwareDirectory/AutoVerScheme/basecommonapi.cpp index ea6f9d8..8887d63 100644 --- a/softwareDirectory/AutoVerScheme/basecommonapi.cpp +++ b/softwareDirectory/AutoVerScheme/basecommonapi.cpp @@ -1520,7 +1520,7 @@ query.bindValue(":dataId", dataId); if (query.exec()) { while (query.next()) { - result.clear(); + result.clear(); result.append(query.value("id").toString()); result.append(query.value("params").toString()); result.append(query.value("capacity").toString()); @@ -1531,10 +1531,9 @@ result.append(query.value("indicating_value").toString()); result.append(query.value("resolution").toString()); result.append(query.value("maximum_error").toString()); - result.append(query.value("error_param_a").toString()); + result.append(query.value("error_param_a").toString()); result.append( query.value("error_param_b").toString()); result.append(query.value("other_outcome").toString()); - resultData.append(result); } } else { @@ -2163,9 +2162,9 @@ { QSqlQuery query; query.prepare("INSERT INTO zd_instruction_library (id,device_id,device_name,instruct_config,instruct_read," - "type,belong_vername,belong_checkname,create_time,update_time,program_id,param) " + "type,belong_vername,belong_checkname,create_time,update_time,verification_program_id,param) " " VALUES (:id,:device_id,:device_name,:instruct_config,:instruct_read,:type,:belong_vername," - ":belong_checkname,:create_time,:update_time,:program_id,:param)"); + ":belong_checkname,:create_time,:update_time,:verification_program_id,:param)"); QString currentDateTime = QDateTime::currentDateTime().toString("yyyy-MM-dd HH:mm:ss"); query.bindValue(":id", instructionLib.id); query.bindValue(":device_id", instructionLib.device_id); @@ -2177,11 +2176,12 @@ query.bindValue(":belong_checkname", instructionLib.belong_checkname); query.bindValue(":create_time", currentDateTime); query.bindValue(":update_time", currentDateTime); - query.bindValue(":program_id", instructionLib.program_id); + query.bindValue(":verification_program_id", instructionLib.program_id); query.bindValue(":param", instructionLib.param); bool isSuccess = query.exec(); // qDebug() << "InsertTaskBasic query failed: " << query.lastQuery(); if (!isSuccess) { + QString str= query.lastError().text(); qDebug() << "InsertTaskBasic query failed: " << query.lastError().text(); } @@ -5210,19 +5210,15 @@ int num = 0; for(int i =0;i<16;i++){ if (!row.isEmpty() && row[27]=="1" && row[2] == "1") { - VerificationItem = "波动性测试"; + VerificationItem = "波动性测试"; //添加列头 QStringList head; head <<"序号"<< "下限点" <<"上限点" <<"单位"<<"示值1"<<"示值2"<<"示值3"<<"示值4"<<"示值5" <<"示值6"<<"示值7"<<"示值8"<<"示值9"<<"示值10"<<"示值11"<<"示值12"<<"示值13"<<"示值14"<<"示值15" <<"最大值"<<"最小值"<<"波动性" ; HeadMapList->insert(VerificationItem,head); - //添加数据 + //添加数据 Data.append(row[3]);//单位 QStringList Data; - Data.append(row[0]); //ID - Data.append(showUpperLimit ? "": row[5]);//下限点 - Data.append(showUpperLimit ? row[4] : ""); // 上限点 - Data.append(row[3]);//单位 Data.append("");//示值1 Data.append("");//示值2 Data.append("");//示值3 @@ -5250,7 +5246,7 @@ VerificationItem = "均匀性测试"; //添加列头 QStringList head; - head <<"序号"<<"单位"<<"下限点"<<"上限点"<<"位置" + head <<"序号"<<"下限点"<<"上限点"<<"单位"<<"位置" <<"示值ROA1"<<"示值RA1"<<"RA2"<<"ROA2"<<"ROA3"<<"RA3"<<"RA4"<<"ROA4"<<"ROA均值"<<"RA均值"<<"上水平面温差" <<"下水平面温差"<<"水平最大温差"<<"工作区域最大温差"; HeadMapList->insert(VerificationItem,head); @@ -5258,9 +5254,9 @@ QStringList Data; Data.append(row[0]); //ID - Data.append(row[3]); //单位 Data.append(showUpperLimit ? "": row[5]);//下限点 Data.append(showUpperLimit ? row[4] : ""); // 上限点 + Data.append(row[3]); //单位 Data.append(character);//位置 Data.append("");//示值ROA1 Data.append("");//示值RA1 @@ -6090,7 +6086,7 @@ QSqlQuery query; query.prepare("SELECT bbdmidsg.*,bbdmii.frequency,bbdmii.power,bbdmii.amplitude_modulation_depth,bbdmii.frequency_modulation_deviation," " bbdmii.remain_amplitude_modulation,bbdmii.remain_frequency_modulation,bbdmii.harmonic,bbdmii.phase_modulation_phase_deviation," - " bbdmii.no_harmonic FROM biz_business_device_measure_item_data_signal_generator bbdmidsg" + " bbdmii.no_harmonic,bbdmii.power AS POW,bbdmii.frequency AS FREQ FROM biz_business_device_measure_item_data_signal_generator bbdmidsg" " JOIN biz_business_device_measure_item_info bbdmii ON bbdmii.id = bbdmidsg.item_id" " WHERE bbdmidsg.item_id = :itemId" " ORDER BY bbdmidsg.update_time DESC"); @@ -6123,7 +6119,7 @@ result.append(query.value("upper_index").toString());//指标上限/THD上限 result.append(query.value("upper_index_unit").toString());//指标上限单位/THD上限单位 result.append(query.value("harmonic_number").toString());//谐波次数 - result.append(query.value("rbw_value").toString());//RBW + result.append(query.value("rbw_value").toString());//RBW 25 result.append(query.value("rbw_value_unit").toString());//RBW单位 result.append(query.value("vbw_value").toString());//VBW result.append(query.value("vbw_value_unit").toString());//VBW单位 @@ -6131,8 +6127,8 @@ result.append(query.value("offset_frequency_unit").toString());//偏移频率单位 result.append(query.value("create_time").toString()); result.append(query.value("update_time").toString()); - result.append(query.value("frequency").toString());//频率 - result.append(query.value("power").toString());//功率 + result.append(query.value("FREQ").toString());//频率 33 + result.append(query.value("POW").toString());//功率 34 result.append(query.value("amplitude_modulation_depth").toString());//调幅深度 result.append(query.value("frequency_modulation_deviation").toString());//调频频偏 result.append(query.value("remain_amplitude_modulation").toString());//剩余调幅