diff --git a/softwareDirectory/AutoVerScheme/AutoVerScheme.pro b/softwareDirectory/AutoVerScheme/AutoVerScheme.pro index 5434f66..b7a7f10 100644 --- a/softwareDirectory/AutoVerScheme/AutoVerScheme.pro +++ b/softwareDirectory/AutoVerScheme/AutoVerScheme.pro @@ -2,6 +2,7 @@ QT += sql QT += widgets QT += axcontainer + greaterThan(QT_MAJOR_VERSION, 4): QT += widgets CONFIG += c++11 diff --git a/softwareDirectory/AutoVerScheme/AutoVerScheme.pro b/softwareDirectory/AutoVerScheme/AutoVerScheme.pro index 5434f66..b7a7f10 100644 --- a/softwareDirectory/AutoVerScheme/AutoVerScheme.pro +++ b/softwareDirectory/AutoVerScheme/AutoVerScheme.pro @@ -2,6 +2,7 @@ QT += sql QT += widgets QT += axcontainer + greaterThan(QT_MAJOR_VERSION, 4): QT += widgets CONFIG += c++11 diff --git a/softwareDirectory/AutoVerScheme/basecommonapi.cpp b/softwareDirectory/AutoVerScheme/basecommonapi.cpp index 109fb2d..2d38212 100644 --- a/softwareDirectory/AutoVerScheme/basecommonapi.cpp +++ b/softwareDirectory/AutoVerScheme/basecommonapi.cpp @@ -306,7 +306,7 @@ //直流稳压电源检定装置 -QListBaseCommonApi::getCheckDCPower(QString equipment_id) +QListBaseCommonApi::getCheckDCPower(QString equipment_id,QStringList *headList) { QList result; @@ -336,7 +336,9 @@ } else { qDebug() << "Query execution failed: " << query.lastError().text(); } - + *headList << "序号"<<"核査类型"<<"检测类型"<<"参数" + <<"单位"<<"频率" << "核査点" << "分辨力" + <<"循环次数"<< "Urel"<<"通道"<< "TFER"; return result; } //根据id获取装置名称 diff --git a/softwareDirectory/AutoVerScheme/AutoVerScheme.pro b/softwareDirectory/AutoVerScheme/AutoVerScheme.pro index 5434f66..b7a7f10 100644 --- a/softwareDirectory/AutoVerScheme/AutoVerScheme.pro +++ b/softwareDirectory/AutoVerScheme/AutoVerScheme.pro @@ -2,6 +2,7 @@ QT += sql QT += widgets QT += axcontainer + greaterThan(QT_MAJOR_VERSION, 4): QT += widgets CONFIG += c++11 diff --git a/softwareDirectory/AutoVerScheme/basecommonapi.cpp b/softwareDirectory/AutoVerScheme/basecommonapi.cpp index 109fb2d..2d38212 100644 --- a/softwareDirectory/AutoVerScheme/basecommonapi.cpp +++ b/softwareDirectory/AutoVerScheme/basecommonapi.cpp @@ -306,7 +306,7 @@ //直流稳压电源检定装置 -QListBaseCommonApi::getCheckDCPower(QString equipment_id) +QListBaseCommonApi::getCheckDCPower(QString equipment_id,QStringList *headList) { QList result; @@ -336,7 +336,9 @@ } else { qDebug() << "Query execution failed: " << query.lastError().text(); } - + *headList << "序号"<<"核査类型"<<"检测类型"<<"参数" + <<"单位"<<"频率" << "核査点" << "分辨力" + <<"循环次数"<< "Urel"<<"通道"<< "TFER"; return result; } //根据id获取装置名称 diff --git a/softwareDirectory/AutoVerScheme/basecommonapi.h b/softwareDirectory/AutoVerScheme/basecommonapi.h index d6045a9..658fdb9 100644 --- a/softwareDirectory/AutoVerScheme/basecommonapi.h +++ b/softwareDirectory/AutoVerScheme/basecommonapi.h @@ -403,7 +403,7 @@ //判断是哪个核查项 static QString getApparatus(QString id); //直流稳压电源检定装置 - static QListgetCheckDCPower(QString item_category_id); + static QListgetCheckDCPower(QString item_category_id,QStringList *headList); //获取被检设备管理首页数据 static QList getTestedDevice(); // 被检设备管理查看设备信息 diff --git a/softwareDirectory/AutoVerScheme/AutoVerScheme.pro b/softwareDirectory/AutoVerScheme/AutoVerScheme.pro index 5434f66..b7a7f10 100644 --- a/softwareDirectory/AutoVerScheme/AutoVerScheme.pro +++ b/softwareDirectory/AutoVerScheme/AutoVerScheme.pro @@ -2,6 +2,7 @@ QT += sql QT += widgets QT += axcontainer + greaterThan(QT_MAJOR_VERSION, 4): QT += widgets CONFIG += c++11 diff --git a/softwareDirectory/AutoVerScheme/basecommonapi.cpp b/softwareDirectory/AutoVerScheme/basecommonapi.cpp index 109fb2d..2d38212 100644 --- a/softwareDirectory/AutoVerScheme/basecommonapi.cpp +++ b/softwareDirectory/AutoVerScheme/basecommonapi.cpp @@ -306,7 +306,7 @@ //直流稳压电源检定装置 -QListBaseCommonApi::getCheckDCPower(QString equipment_id) +QListBaseCommonApi::getCheckDCPower(QString equipment_id,QStringList *headList) { QList result; @@ -336,7 +336,9 @@ } else { qDebug() << "Query execution failed: " << query.lastError().text(); } - + *headList << "序号"<<"核査类型"<<"检测类型"<<"参数" + <<"单位"<<"频率" << "核査点" << "分辨力" + <<"循环次数"<< "Urel"<<"通道"<< "TFER"; return result; } //根据id获取装置名称 diff --git a/softwareDirectory/AutoVerScheme/basecommonapi.h b/softwareDirectory/AutoVerScheme/basecommonapi.h index d6045a9..658fdb9 100644 --- a/softwareDirectory/AutoVerScheme/basecommonapi.h +++ b/softwareDirectory/AutoVerScheme/basecommonapi.h @@ -403,7 +403,7 @@ //判断是哪个核查项 static QString getApparatus(QString id); //直流稳压电源检定装置 - static QListgetCheckDCPower(QString item_category_id); + static QListgetCheckDCPower(QString item_category_id,QStringList *headList); //获取被检设备管理首页数据 static QList getTestedDevice(); // 被检设备管理查看设备信息 diff --git a/softwareDirectory/AutoVerScheme/beexamined_deviceitem.cpp b/softwareDirectory/AutoVerScheme/beexamined_deviceitem.cpp index cc02581..c3b2786 100644 --- a/softwareDirectory/AutoVerScheme/beexamined_deviceitem.cpp +++ b/softwareDirectory/AutoVerScheme/beexamined_deviceitem.cpp @@ -1,8 +1,10 @@ #include "beexamined_deviceitem.h" #include "ui_beexamined_deviceitem.h" #include "QMessageBox.h" +#include "basecommonapi.h" //#include "tested_device_manage_serve.h" + //被检设备 BeExamined_DeviceItem::BeExamined_DeviceItem(QWidget *parent) : InfoBase(parent), diff --git a/softwareDirectory/AutoVerScheme/AutoVerScheme.pro b/softwareDirectory/AutoVerScheme/AutoVerScheme.pro index 5434f66..b7a7f10 100644 --- a/softwareDirectory/AutoVerScheme/AutoVerScheme.pro +++ b/softwareDirectory/AutoVerScheme/AutoVerScheme.pro @@ -2,6 +2,7 @@ QT += sql QT += widgets QT += axcontainer + greaterThan(QT_MAJOR_VERSION, 4): QT += widgets CONFIG += c++11 diff --git a/softwareDirectory/AutoVerScheme/basecommonapi.cpp b/softwareDirectory/AutoVerScheme/basecommonapi.cpp index 109fb2d..2d38212 100644 --- a/softwareDirectory/AutoVerScheme/basecommonapi.cpp +++ b/softwareDirectory/AutoVerScheme/basecommonapi.cpp @@ -306,7 +306,7 @@ //直流稳压电源检定装置 -QListBaseCommonApi::getCheckDCPower(QString equipment_id) +QListBaseCommonApi::getCheckDCPower(QString equipment_id,QStringList *headList) { QList result; @@ -336,7 +336,9 @@ } else { qDebug() << "Query execution failed: " << query.lastError().text(); } - + *headList << "序号"<<"核査类型"<<"检测类型"<<"参数" + <<"单位"<<"频率" << "核査点" << "分辨力" + <<"循环次数"<< "Urel"<<"通道"<< "TFER"; return result; } //根据id获取装置名称 diff --git a/softwareDirectory/AutoVerScheme/basecommonapi.h b/softwareDirectory/AutoVerScheme/basecommonapi.h index d6045a9..658fdb9 100644 --- a/softwareDirectory/AutoVerScheme/basecommonapi.h +++ b/softwareDirectory/AutoVerScheme/basecommonapi.h @@ -403,7 +403,7 @@ //判断是哪个核查项 static QString getApparatus(QString id); //直流稳压电源检定装置 - static QListgetCheckDCPower(QString item_category_id); + static QListgetCheckDCPower(QString item_category_id,QStringList *headList); //获取被检设备管理首页数据 static QList getTestedDevice(); // 被检设备管理查看设备信息 diff --git a/softwareDirectory/AutoVerScheme/beexamined_deviceitem.cpp b/softwareDirectory/AutoVerScheme/beexamined_deviceitem.cpp index cc02581..c3b2786 100644 --- a/softwareDirectory/AutoVerScheme/beexamined_deviceitem.cpp +++ b/softwareDirectory/AutoVerScheme/beexamined_deviceitem.cpp @@ -1,8 +1,10 @@ #include "beexamined_deviceitem.h" #include "ui_beexamined_deviceitem.h" #include "QMessageBox.h" +#include "basecommonapi.h" //#include "tested_device_manage_serve.h" + //被检设备 BeExamined_DeviceItem::BeExamined_DeviceItem(QWidget *parent) : InfoBase(parent), diff --git a/softwareDirectory/AutoVerScheme/checkwindow.cpp b/softwareDirectory/AutoVerScheme/checkwindow.cpp index f3662bc..a5b8cbc 100644 --- a/softwareDirectory/AutoVerScheme/checkwindow.cpp +++ b/softwareDirectory/AutoVerScheme/checkwindow.cpp @@ -57,6 +57,10 @@ void CheckWindow::getCheckDevice() { + + BaseCommonApi dbManager; + // 调用数据库管理器的函数获取数据 + //模拟用户ID QString userId="1640229293790650370"; QList data = BaseCommonApi::getMyTasks(userId); diff --git a/softwareDirectory/AutoVerScheme/AutoVerScheme.pro b/softwareDirectory/AutoVerScheme/AutoVerScheme.pro index 5434f66..b7a7f10 100644 --- a/softwareDirectory/AutoVerScheme/AutoVerScheme.pro +++ b/softwareDirectory/AutoVerScheme/AutoVerScheme.pro @@ -2,6 +2,7 @@ QT += sql QT += widgets QT += axcontainer + greaterThan(QT_MAJOR_VERSION, 4): QT += widgets CONFIG += c++11 diff --git a/softwareDirectory/AutoVerScheme/basecommonapi.cpp b/softwareDirectory/AutoVerScheme/basecommonapi.cpp index 109fb2d..2d38212 100644 --- a/softwareDirectory/AutoVerScheme/basecommonapi.cpp +++ b/softwareDirectory/AutoVerScheme/basecommonapi.cpp @@ -306,7 +306,7 @@ //直流稳压电源检定装置 -QListBaseCommonApi::getCheckDCPower(QString equipment_id) +QListBaseCommonApi::getCheckDCPower(QString equipment_id,QStringList *headList) { QList result; @@ -336,7 +336,9 @@ } else { qDebug() << "Query execution failed: " << query.lastError().text(); } - + *headList << "序号"<<"核査类型"<<"检测类型"<<"参数" + <<"单位"<<"频率" << "核査点" << "分辨力" + <<"循环次数"<< "Urel"<<"通道"<< "TFER"; return result; } //根据id获取装置名称 diff --git a/softwareDirectory/AutoVerScheme/basecommonapi.h b/softwareDirectory/AutoVerScheme/basecommonapi.h index d6045a9..658fdb9 100644 --- a/softwareDirectory/AutoVerScheme/basecommonapi.h +++ b/softwareDirectory/AutoVerScheme/basecommonapi.h @@ -403,7 +403,7 @@ //判断是哪个核查项 static QString getApparatus(QString id); //直流稳压电源检定装置 - static QListgetCheckDCPower(QString item_category_id); + static QListgetCheckDCPower(QString item_category_id,QStringList *headList); //获取被检设备管理首页数据 static QList getTestedDevice(); // 被检设备管理查看设备信息 diff --git a/softwareDirectory/AutoVerScheme/beexamined_deviceitem.cpp b/softwareDirectory/AutoVerScheme/beexamined_deviceitem.cpp index cc02581..c3b2786 100644 --- a/softwareDirectory/AutoVerScheme/beexamined_deviceitem.cpp +++ b/softwareDirectory/AutoVerScheme/beexamined_deviceitem.cpp @@ -1,8 +1,10 @@ #include "beexamined_deviceitem.h" #include "ui_beexamined_deviceitem.h" #include "QMessageBox.h" +#include "basecommonapi.h" //#include "tested_device_manage_serve.h" + //被检设备 BeExamined_DeviceItem::BeExamined_DeviceItem(QWidget *parent) : InfoBase(parent), diff --git a/softwareDirectory/AutoVerScheme/checkwindow.cpp b/softwareDirectory/AutoVerScheme/checkwindow.cpp index f3662bc..a5b8cbc 100644 --- a/softwareDirectory/AutoVerScheme/checkwindow.cpp +++ b/softwareDirectory/AutoVerScheme/checkwindow.cpp @@ -57,6 +57,10 @@ void CheckWindow::getCheckDevice() { + + BaseCommonApi dbManager; + // 调用数据库管理器的函数获取数据 + //模拟用户ID QString userId="1640229293790650370"; QList data = BaseCommonApi::getMyTasks(userId); diff --git a/softwareDirectory/AutoVerScheme/depar_task.ui b/softwareDirectory/AutoVerScheme/depar_task.ui index 1a95cc4..efb7561 100644 --- a/softwareDirectory/AutoVerScheme/depar_task.ui +++ b/softwareDirectory/AutoVerScheme/depar_task.ui @@ -208,11 +208,91 @@ - - + + - + + + + 12 + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + + + PushButton + + + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + + + PushButton + + + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + + + PushButton + + + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + + diff --git a/softwareDirectory/AutoVerScheme/AutoVerScheme.pro b/softwareDirectory/AutoVerScheme/AutoVerScheme.pro index 5434f66..b7a7f10 100644 --- a/softwareDirectory/AutoVerScheme/AutoVerScheme.pro +++ b/softwareDirectory/AutoVerScheme/AutoVerScheme.pro @@ -2,6 +2,7 @@ QT += sql QT += widgets QT += axcontainer + greaterThan(QT_MAJOR_VERSION, 4): QT += widgets CONFIG += c++11 diff --git a/softwareDirectory/AutoVerScheme/basecommonapi.cpp b/softwareDirectory/AutoVerScheme/basecommonapi.cpp index 109fb2d..2d38212 100644 --- a/softwareDirectory/AutoVerScheme/basecommonapi.cpp +++ b/softwareDirectory/AutoVerScheme/basecommonapi.cpp @@ -306,7 +306,7 @@ //直流稳压电源检定装置 -QListBaseCommonApi::getCheckDCPower(QString equipment_id) +QListBaseCommonApi::getCheckDCPower(QString equipment_id,QStringList *headList) { QList result; @@ -336,7 +336,9 @@ } else { qDebug() << "Query execution failed: " << query.lastError().text(); } - + *headList << "序号"<<"核査类型"<<"检测类型"<<"参数" + <<"单位"<<"频率" << "核査点" << "分辨力" + <<"循环次数"<< "Urel"<<"通道"<< "TFER"; return result; } //根据id获取装置名称 diff --git a/softwareDirectory/AutoVerScheme/basecommonapi.h b/softwareDirectory/AutoVerScheme/basecommonapi.h index d6045a9..658fdb9 100644 --- a/softwareDirectory/AutoVerScheme/basecommonapi.h +++ b/softwareDirectory/AutoVerScheme/basecommonapi.h @@ -403,7 +403,7 @@ //判断是哪个核查项 static QString getApparatus(QString id); //直流稳压电源检定装置 - static QListgetCheckDCPower(QString item_category_id); + static QListgetCheckDCPower(QString item_category_id,QStringList *headList); //获取被检设备管理首页数据 static QList getTestedDevice(); // 被检设备管理查看设备信息 diff --git a/softwareDirectory/AutoVerScheme/beexamined_deviceitem.cpp b/softwareDirectory/AutoVerScheme/beexamined_deviceitem.cpp index cc02581..c3b2786 100644 --- a/softwareDirectory/AutoVerScheme/beexamined_deviceitem.cpp +++ b/softwareDirectory/AutoVerScheme/beexamined_deviceitem.cpp @@ -1,8 +1,10 @@ #include "beexamined_deviceitem.h" #include "ui_beexamined_deviceitem.h" #include "QMessageBox.h" +#include "basecommonapi.h" //#include "tested_device_manage_serve.h" + //被检设备 BeExamined_DeviceItem::BeExamined_DeviceItem(QWidget *parent) : InfoBase(parent), diff --git a/softwareDirectory/AutoVerScheme/checkwindow.cpp b/softwareDirectory/AutoVerScheme/checkwindow.cpp index f3662bc..a5b8cbc 100644 --- a/softwareDirectory/AutoVerScheme/checkwindow.cpp +++ b/softwareDirectory/AutoVerScheme/checkwindow.cpp @@ -57,6 +57,10 @@ void CheckWindow::getCheckDevice() { + + BaseCommonApi dbManager; + // 调用数据库管理器的函数获取数据 + //模拟用户ID QString userId="1640229293790650370"; QList data = BaseCommonApi::getMyTasks(userId); diff --git a/softwareDirectory/AutoVerScheme/depar_task.ui b/softwareDirectory/AutoVerScheme/depar_task.ui index 1a95cc4..efb7561 100644 --- a/softwareDirectory/AutoVerScheme/depar_task.ui +++ b/softwareDirectory/AutoVerScheme/depar_task.ui @@ -208,11 +208,91 @@ - - + + - + + + + 12 + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + + + PushButton + + + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + + + PushButton + + + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + + + PushButton + + + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + + diff --git a/softwareDirectory/AutoVerScheme/my_task.cpp b/softwareDirectory/AutoVerScheme/my_task.cpp index e665fb4..8d7abf7 100644 --- a/softwareDirectory/AutoVerScheme/my_task.cpp +++ b/softwareDirectory/AutoVerScheme/my_task.cpp @@ -64,7 +64,9 @@ //先设置为行为0 ui->tableWidget->setRowCount(0); - //MyTasks dbManager; + + BaseCommonApi dbManager; + // 调用数据库管理器的函数获取数据 //模拟用户ID QString userId="1640229293790650370"; diff --git a/softwareDirectory/AutoVerScheme/AutoVerScheme.pro b/softwareDirectory/AutoVerScheme/AutoVerScheme.pro index 5434f66..b7a7f10 100644 --- a/softwareDirectory/AutoVerScheme/AutoVerScheme.pro +++ b/softwareDirectory/AutoVerScheme/AutoVerScheme.pro @@ -2,6 +2,7 @@ QT += sql QT += widgets QT += axcontainer + greaterThan(QT_MAJOR_VERSION, 4): QT += widgets CONFIG += c++11 diff --git a/softwareDirectory/AutoVerScheme/basecommonapi.cpp b/softwareDirectory/AutoVerScheme/basecommonapi.cpp index 109fb2d..2d38212 100644 --- a/softwareDirectory/AutoVerScheme/basecommonapi.cpp +++ b/softwareDirectory/AutoVerScheme/basecommonapi.cpp @@ -306,7 +306,7 @@ //直流稳压电源检定装置 -QListBaseCommonApi::getCheckDCPower(QString equipment_id) +QListBaseCommonApi::getCheckDCPower(QString equipment_id,QStringList *headList) { QList result; @@ -336,7 +336,9 @@ } else { qDebug() << "Query execution failed: " << query.lastError().text(); } - + *headList << "序号"<<"核査类型"<<"检测类型"<<"参数" + <<"单位"<<"频率" << "核査点" << "分辨力" + <<"循环次数"<< "Urel"<<"通道"<< "TFER"; return result; } //根据id获取装置名称 diff --git a/softwareDirectory/AutoVerScheme/basecommonapi.h b/softwareDirectory/AutoVerScheme/basecommonapi.h index d6045a9..658fdb9 100644 --- a/softwareDirectory/AutoVerScheme/basecommonapi.h +++ b/softwareDirectory/AutoVerScheme/basecommonapi.h @@ -403,7 +403,7 @@ //判断是哪个核查项 static QString getApparatus(QString id); //直流稳压电源检定装置 - static QListgetCheckDCPower(QString item_category_id); + static QListgetCheckDCPower(QString item_category_id,QStringList *headList); //获取被检设备管理首页数据 static QList getTestedDevice(); // 被检设备管理查看设备信息 diff --git a/softwareDirectory/AutoVerScheme/beexamined_deviceitem.cpp b/softwareDirectory/AutoVerScheme/beexamined_deviceitem.cpp index cc02581..c3b2786 100644 --- a/softwareDirectory/AutoVerScheme/beexamined_deviceitem.cpp +++ b/softwareDirectory/AutoVerScheme/beexamined_deviceitem.cpp @@ -1,8 +1,10 @@ #include "beexamined_deviceitem.h" #include "ui_beexamined_deviceitem.h" #include "QMessageBox.h" +#include "basecommonapi.h" //#include "tested_device_manage_serve.h" + //被检设备 BeExamined_DeviceItem::BeExamined_DeviceItem(QWidget *parent) : InfoBase(parent), diff --git a/softwareDirectory/AutoVerScheme/checkwindow.cpp b/softwareDirectory/AutoVerScheme/checkwindow.cpp index f3662bc..a5b8cbc 100644 --- a/softwareDirectory/AutoVerScheme/checkwindow.cpp +++ b/softwareDirectory/AutoVerScheme/checkwindow.cpp @@ -57,6 +57,10 @@ void CheckWindow::getCheckDevice() { + + BaseCommonApi dbManager; + // 调用数据库管理器的函数获取数据 + //模拟用户ID QString userId="1640229293790650370"; QList data = BaseCommonApi::getMyTasks(userId); diff --git a/softwareDirectory/AutoVerScheme/depar_task.ui b/softwareDirectory/AutoVerScheme/depar_task.ui index 1a95cc4..efb7561 100644 --- a/softwareDirectory/AutoVerScheme/depar_task.ui +++ b/softwareDirectory/AutoVerScheme/depar_task.ui @@ -208,11 +208,91 @@ - - + + - + + + + 12 + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + + + PushButton + + + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + + + PushButton + + + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + + + PushButton + + + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + + diff --git a/softwareDirectory/AutoVerScheme/my_task.cpp b/softwareDirectory/AutoVerScheme/my_task.cpp index e665fb4..8d7abf7 100644 --- a/softwareDirectory/AutoVerScheme/my_task.cpp +++ b/softwareDirectory/AutoVerScheme/my_task.cpp @@ -64,7 +64,9 @@ //先设置为行为0 ui->tableWidget->setRowCount(0); - //MyTasks dbManager; + + BaseCommonApi dbManager; + // 调用数据库管理器的函数获取数据 //模拟用户ID QString userId="1640229293790650370"; diff --git a/softwareDirectory/AutoVerScheme/standard_deviceitem.cpp b/softwareDirectory/AutoVerScheme/standard_deviceitem.cpp index 52e098c..456b1aa 100644 --- a/softwareDirectory/AutoVerScheme/standard_deviceitem.cpp +++ b/softwareDirectory/AutoVerScheme/standard_deviceitem.cpp @@ -92,7 +92,9 @@ // 创建数据库管理器对象 //BizDeviceManage包含虚方法 指针实例化 - //BizDeviceManage dbManager; + + BaseCommonApi dbManager; + // 调用数据库管理器的函数获取数据 int rowCount=0; int row=0; @@ -154,8 +156,9 @@ { - //BizDeviceManage dbManager; - QList data = BaseCommonApi::getCatDeviceInfor(id); + BaseCommonApi dbManager; + QList data = dbManager.getCatDeviceInfor(id); + // 获取当前日期 使用年限=当前日期减去购进日期 QDate currentDate = QDate::currentDate(); QDate purchase_date; @@ -201,8 +204,8 @@ //获取核查点tablewight的数据 QStringList headlist; QString DeviceName = BaseCommonApi::getApparatus(id); - //QList bizDeviceManageData=dbManager.getCheckDCPower(DeviceName,&headlist); - QList bizDeviceManageData = BaseCommonApi::getCheckDCPower(id); + QList bizDeviceManageData=dbManager.getCheckDCPower(DeviceName,&headlist); + //QList bizDeviceManageData = BaseCommonApi::getCheckDCPower(id); //设置tablewight ui->tableWidgetItem->setRowCount(0); ui->tableWidgetItem->setColumnCount(headlist.count()); diff --git a/softwareDirectory/AutoVerScheme/AutoVerScheme.pro b/softwareDirectory/AutoVerScheme/AutoVerScheme.pro index 5434f66..b7a7f10 100644 --- a/softwareDirectory/AutoVerScheme/AutoVerScheme.pro +++ b/softwareDirectory/AutoVerScheme/AutoVerScheme.pro @@ -2,6 +2,7 @@ QT += sql QT += widgets QT += axcontainer + greaterThan(QT_MAJOR_VERSION, 4): QT += widgets CONFIG += c++11 diff --git a/softwareDirectory/AutoVerScheme/basecommonapi.cpp b/softwareDirectory/AutoVerScheme/basecommonapi.cpp index 109fb2d..2d38212 100644 --- a/softwareDirectory/AutoVerScheme/basecommonapi.cpp +++ b/softwareDirectory/AutoVerScheme/basecommonapi.cpp @@ -306,7 +306,7 @@ //直流稳压电源检定装置 -QListBaseCommonApi::getCheckDCPower(QString equipment_id) +QListBaseCommonApi::getCheckDCPower(QString equipment_id,QStringList *headList) { QList result; @@ -336,7 +336,9 @@ } else { qDebug() << "Query execution failed: " << query.lastError().text(); } - + *headList << "序号"<<"核査类型"<<"检测类型"<<"参数" + <<"单位"<<"频率" << "核査点" << "分辨力" + <<"循环次数"<< "Urel"<<"通道"<< "TFER"; return result; } //根据id获取装置名称 diff --git a/softwareDirectory/AutoVerScheme/basecommonapi.h b/softwareDirectory/AutoVerScheme/basecommonapi.h index d6045a9..658fdb9 100644 --- a/softwareDirectory/AutoVerScheme/basecommonapi.h +++ b/softwareDirectory/AutoVerScheme/basecommonapi.h @@ -403,7 +403,7 @@ //判断是哪个核查项 static QString getApparatus(QString id); //直流稳压电源检定装置 - static QListgetCheckDCPower(QString item_category_id); + static QListgetCheckDCPower(QString item_category_id,QStringList *headList); //获取被检设备管理首页数据 static QList getTestedDevice(); // 被检设备管理查看设备信息 diff --git a/softwareDirectory/AutoVerScheme/beexamined_deviceitem.cpp b/softwareDirectory/AutoVerScheme/beexamined_deviceitem.cpp index cc02581..c3b2786 100644 --- a/softwareDirectory/AutoVerScheme/beexamined_deviceitem.cpp +++ b/softwareDirectory/AutoVerScheme/beexamined_deviceitem.cpp @@ -1,8 +1,10 @@ #include "beexamined_deviceitem.h" #include "ui_beexamined_deviceitem.h" #include "QMessageBox.h" +#include "basecommonapi.h" //#include "tested_device_manage_serve.h" + //被检设备 BeExamined_DeviceItem::BeExamined_DeviceItem(QWidget *parent) : InfoBase(parent), diff --git a/softwareDirectory/AutoVerScheme/checkwindow.cpp b/softwareDirectory/AutoVerScheme/checkwindow.cpp index f3662bc..a5b8cbc 100644 --- a/softwareDirectory/AutoVerScheme/checkwindow.cpp +++ b/softwareDirectory/AutoVerScheme/checkwindow.cpp @@ -57,6 +57,10 @@ void CheckWindow::getCheckDevice() { + + BaseCommonApi dbManager; + // 调用数据库管理器的函数获取数据 + //模拟用户ID QString userId="1640229293790650370"; QList data = BaseCommonApi::getMyTasks(userId); diff --git a/softwareDirectory/AutoVerScheme/depar_task.ui b/softwareDirectory/AutoVerScheme/depar_task.ui index 1a95cc4..efb7561 100644 --- a/softwareDirectory/AutoVerScheme/depar_task.ui +++ b/softwareDirectory/AutoVerScheme/depar_task.ui @@ -208,11 +208,91 @@ - - + + - + + + + 12 + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + + + PushButton + + + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + + + PushButton + + + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + + + PushButton + + + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + + diff --git a/softwareDirectory/AutoVerScheme/my_task.cpp b/softwareDirectory/AutoVerScheme/my_task.cpp index e665fb4..8d7abf7 100644 --- a/softwareDirectory/AutoVerScheme/my_task.cpp +++ b/softwareDirectory/AutoVerScheme/my_task.cpp @@ -64,7 +64,9 @@ //先设置为行为0 ui->tableWidget->setRowCount(0); - //MyTasks dbManager; + + BaseCommonApi dbManager; + // 调用数据库管理器的函数获取数据 //模拟用户ID QString userId="1640229293790650370"; diff --git a/softwareDirectory/AutoVerScheme/standard_deviceitem.cpp b/softwareDirectory/AutoVerScheme/standard_deviceitem.cpp index 52e098c..456b1aa 100644 --- a/softwareDirectory/AutoVerScheme/standard_deviceitem.cpp +++ b/softwareDirectory/AutoVerScheme/standard_deviceitem.cpp @@ -92,7 +92,9 @@ // 创建数据库管理器对象 //BizDeviceManage包含虚方法 指针实例化 - //BizDeviceManage dbManager; + + BaseCommonApi dbManager; + // 调用数据库管理器的函数获取数据 int rowCount=0; int row=0; @@ -154,8 +156,9 @@ { - //BizDeviceManage dbManager; - QList data = BaseCommonApi::getCatDeviceInfor(id); + BaseCommonApi dbManager; + QList data = dbManager.getCatDeviceInfor(id); + // 获取当前日期 使用年限=当前日期减去购进日期 QDate currentDate = QDate::currentDate(); QDate purchase_date; @@ -201,8 +204,8 @@ //获取核查点tablewight的数据 QStringList headlist; QString DeviceName = BaseCommonApi::getApparatus(id); - //QList bizDeviceManageData=dbManager.getCheckDCPower(DeviceName,&headlist); - QList bizDeviceManageData = BaseCommonApi::getCheckDCPower(id); + QList bizDeviceManageData=dbManager.getCheckDCPower(DeviceName,&headlist); + //QList bizDeviceManageData = BaseCommonApi::getCheckDCPower(id); //设置tablewight ui->tableWidgetItem->setRowCount(0); ui->tableWidgetItem->setColumnCount(headlist.count()); diff --git a/softwareDirectory/AutoVerScheme/verifydevice.cpp b/softwareDirectory/AutoVerScheme/verifydevice.cpp index 1a13c60..27fb42c 100644 --- a/softwareDirectory/AutoVerScheme/verifydevice.cpp +++ b/softwareDirectory/AutoVerScheme/verifydevice.cpp @@ -25,6 +25,11 @@ void VerifyDevice::getVerifyDevice() { + BaseCommonApi dbManager; + // 调用数据库管理器的函数获取数据 + + + int rowCount=0; int row=0; QList data = BaseCommonApi::getBizDeviceManage(); @@ -43,6 +48,11 @@ void VerifyDevice::getCheckDevice() { + + BaseCommonApi dbManager; + // 调用数据库管理器的函数获取数据 + + int rowCount=0; int row=0; QList data = BaseCommonApi::getBizDeviceManage();