diff --git a/softwareDirectory/AutoVerScheme/dialogcheckresult.cpp b/softwareDirectory/AutoVerScheme/dialogcheckresult.cpp index 82ccd24..d32ade9 100644 --- a/softwareDirectory/AutoVerScheme/dialogcheckresult.cpp +++ b/softwareDirectory/AutoVerScheme/dialogcheckresult.cpp @@ -313,7 +313,7 @@ measInfo.measure_address=ui->comboBoxPlace->currentText(); measInfo.trace_date = ui->dateEditCheck->date(); measInfo.measure_valid_date = ui->dateEdit_Valid->dateTime(); - measInfo.outcome = ui->lineEdit_Cons->text(); + //measInfo.outcome = ui->lineEdit_Cons->text(); measInfo.create_user_name = ui->comboBox_User->currentText(); measInfo.data_source = "自动检定系统"; measInfo.appearance_function_check = "外观完好,工作正常"; diff --git a/softwareDirectory/AutoVerScheme/dialogcheckresult.cpp b/softwareDirectory/AutoVerScheme/dialogcheckresult.cpp index 82ccd24..d32ade9 100644 --- a/softwareDirectory/AutoVerScheme/dialogcheckresult.cpp +++ b/softwareDirectory/AutoVerScheme/dialogcheckresult.cpp @@ -313,7 +313,7 @@ measInfo.measure_address=ui->comboBoxPlace->currentText(); measInfo.trace_date = ui->dateEditCheck->date(); measInfo.measure_valid_date = ui->dateEdit_Valid->dateTime(); - measInfo.outcome = ui->lineEdit_Cons->text(); + //measInfo.outcome = ui->lineEdit_Cons->text(); measInfo.create_user_name = ui->comboBox_User->currentText(); measInfo.data_source = "自动检定系统"; measInfo.appearance_function_check = "外观完好,工作正常"; diff --git a/softwareDirectory/AutoVerScheme/dialogcheckresult.ui b/softwareDirectory/AutoVerScheme/dialogcheckresult.ui index 16003c0..141094c 100644 --- a/softwareDirectory/AutoVerScheme/dialogcheckresult.ui +++ b/softwareDirectory/AutoVerScheme/dialogcheckresult.ui @@ -115,6 +115,28 @@ + + + + 75 + true + + + + background-color: rgb(51, 69, 130); +color: rgb(255, 255, 255); + + + 保存结果 + + + + :/image/Index/u1180.svg + + + + + background-color: rgb(100, 132, 68); @@ -134,9 +156,6 @@ - - - @@ -229,13 +248,6 @@ - - - - 结论: - - - @@ -256,14 +268,14 @@ - + 计量标识: - + @@ -291,96 +303,6 @@ - - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - - 75 - true - - - - background-color: rgb(51, 69, 130); -color: rgb(255, 255, 255); - - - 预览 - - - - :/image/Index/u1220.svg - - - - - - - - Qt::Horizontal - - - QSizePolicy::Fixed - - - - 100 - 20 - - - - - - - - - 75 - true - - - - background-color: rgb(51, 69, 130); -color: rgb(255, 255, 255); - - - 保存 - - - - :/image/Index/u1180.svg - - - - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - -