diff --git a/softwareDirectory/AutoVerScheme/AutoVerScheme.pro.user b/softwareDirectory/AutoVerScheme/AutoVerScheme.pro.user index c5290fc..a1348fb 100644 --- a/softwareDirectory/AutoVerScheme/AutoVerScheme.pro.user +++ b/softwareDirectory/AutoVerScheme/AutoVerScheme.pro.user @@ -1,6 +1,6 @@ - + EnvironmentId diff --git a/softwareDirectory/AutoVerScheme/AutoVerScheme.pro.user b/softwareDirectory/AutoVerScheme/AutoVerScheme.pro.user index c5290fc..a1348fb 100644 --- a/softwareDirectory/AutoVerScheme/AutoVerScheme.pro.user +++ b/softwareDirectory/AutoVerScheme/AutoVerScheme.pro.user @@ -1,6 +1,6 @@ - + EnvironmentId diff --git a/softwareDirectory/AutoVerScheme/basecommonapi.cpp b/softwareDirectory/AutoVerScheme/basecommonapi.cpp index 931a7c1..eb71984 100644 --- a/softwareDirectory/AutoVerScheme/basecommonapi.cpp +++ b/softwareDirectory/AutoVerScheme/basecommonapi.cpp @@ -738,7 +738,7 @@ } //检定程序管理首页查询 -QList getVerificationProgramInfoMain() +QList BaseCommonApi::getVerificationProgramInfoMain() { QList result; QSqlQuery query; diff --git a/softwareDirectory/AutoVerScheme/AutoVerScheme.pro.user b/softwareDirectory/AutoVerScheme/AutoVerScheme.pro.user index c5290fc..a1348fb 100644 --- a/softwareDirectory/AutoVerScheme/AutoVerScheme.pro.user +++ b/softwareDirectory/AutoVerScheme/AutoVerScheme.pro.user @@ -1,6 +1,6 @@ - + EnvironmentId diff --git a/softwareDirectory/AutoVerScheme/basecommonapi.cpp b/softwareDirectory/AutoVerScheme/basecommonapi.cpp index 931a7c1..eb71984 100644 --- a/softwareDirectory/AutoVerScheme/basecommonapi.cpp +++ b/softwareDirectory/AutoVerScheme/basecommonapi.cpp @@ -738,7 +738,7 @@ } //检定程序管理首页查询 -QList getVerificationProgramInfoMain() +QList BaseCommonApi::getVerificationProgramInfoMain() { QList result; QSqlQuery query; diff --git a/softwareDirectory/AutoVerScheme/checkmethodmanage.cpp b/softwareDirectory/AutoVerScheme/checkmethodmanage.cpp index 5b7a728..f4034e2 100644 --- a/softwareDirectory/AutoVerScheme/checkmethodmanage.cpp +++ b/softwareDirectory/AutoVerScheme/checkmethodmanage.cpp @@ -7,8 +7,9 @@ ui(new Ui::CheckMethodManage) { ui->setupUi(this); - for(int i=2;i<7;i++) + for(int i=1;i<6;i++) ui->tableWidget_2->horizontalHeader()->setSectionResizeMode(i,QHeaderView::Stretch); + getCheckMethod(); } CheckMethodManage::~CheckMethodManage() @@ -24,3 +25,34 @@ checkWindow->show(); } +void CheckMethodManage::getCheckMethod() +{ + programList = BaseCommonApi::getVerificationProgramInfoMain(); + int rowCount = 0; + int row=0; + for (const VerificationProgramInfo& program : programList) { + rowCount = ui->tableWidget_2->rowCount(); + + ui->tableWidget_2->insertRow(rowCount); + ui->tableWidget_2->setItem(row, 0, new QTableWidgetItem(QString::number(row+1))); + + //ui->tableWidget->setItem(row, 0, new QTableWidgetItem(dept.id)); + ui->tableWidget_2->setItem(row, 1, new QTableWidgetItem(program.program_name)); //设置数据 + ui->tableWidget_2->setItem(row, 2, new QTableWidgetItem(program.create_name)); //设置数据 + ui->tableWidget_2->setItem(row, 3, new QTableWidgetItem(program.create_time.toString())); //设置数据 + ui->tableWidget_2->setItem(row, 4, new QTableWidgetItem(program.help_instruction)); //设置数据 + + QPushButton *btn_1 = new QPushButton(); + btn_1->setText(tr("编辑")); + QPushButton *btn_2 = new QPushButton(); + btn_2->setText(tr("删除")); + + QWidget *tmp_widget = new QWidget(); + QHBoxLayout *tmp_layout = new QHBoxLayout(tmp_widget); + tmp_layout->addWidget(btn_1); + tmp_layout->addWidget(btn_2); + tmp_layout->setMargin(0); + ui->tableWidget_2->setCellWidget(row,6,tmp_widget); + row++; + } +} diff --git a/softwareDirectory/AutoVerScheme/AutoVerScheme.pro.user b/softwareDirectory/AutoVerScheme/AutoVerScheme.pro.user index c5290fc..a1348fb 100644 --- a/softwareDirectory/AutoVerScheme/AutoVerScheme.pro.user +++ b/softwareDirectory/AutoVerScheme/AutoVerScheme.pro.user @@ -1,6 +1,6 @@ - + EnvironmentId diff --git a/softwareDirectory/AutoVerScheme/basecommonapi.cpp b/softwareDirectory/AutoVerScheme/basecommonapi.cpp index 931a7c1..eb71984 100644 --- a/softwareDirectory/AutoVerScheme/basecommonapi.cpp +++ b/softwareDirectory/AutoVerScheme/basecommonapi.cpp @@ -738,7 +738,7 @@ } //检定程序管理首页查询 -QList getVerificationProgramInfoMain() +QList BaseCommonApi::getVerificationProgramInfoMain() { QList result; QSqlQuery query; diff --git a/softwareDirectory/AutoVerScheme/checkmethodmanage.cpp b/softwareDirectory/AutoVerScheme/checkmethodmanage.cpp index 5b7a728..f4034e2 100644 --- a/softwareDirectory/AutoVerScheme/checkmethodmanage.cpp +++ b/softwareDirectory/AutoVerScheme/checkmethodmanage.cpp @@ -7,8 +7,9 @@ ui(new Ui::CheckMethodManage) { ui->setupUi(this); - for(int i=2;i<7;i++) + for(int i=1;i<6;i++) ui->tableWidget_2->horizontalHeader()->setSectionResizeMode(i,QHeaderView::Stretch); + getCheckMethod(); } CheckMethodManage::~CheckMethodManage() @@ -24,3 +25,34 @@ checkWindow->show(); } +void CheckMethodManage::getCheckMethod() +{ + programList = BaseCommonApi::getVerificationProgramInfoMain(); + int rowCount = 0; + int row=0; + for (const VerificationProgramInfo& program : programList) { + rowCount = ui->tableWidget_2->rowCount(); + + ui->tableWidget_2->insertRow(rowCount); + ui->tableWidget_2->setItem(row, 0, new QTableWidgetItem(QString::number(row+1))); + + //ui->tableWidget->setItem(row, 0, new QTableWidgetItem(dept.id)); + ui->tableWidget_2->setItem(row, 1, new QTableWidgetItem(program.program_name)); //设置数据 + ui->tableWidget_2->setItem(row, 2, new QTableWidgetItem(program.create_name)); //设置数据 + ui->tableWidget_2->setItem(row, 3, new QTableWidgetItem(program.create_time.toString())); //设置数据 + ui->tableWidget_2->setItem(row, 4, new QTableWidgetItem(program.help_instruction)); //设置数据 + + QPushButton *btn_1 = new QPushButton(); + btn_1->setText(tr("编辑")); + QPushButton *btn_2 = new QPushButton(); + btn_2->setText(tr("删除")); + + QWidget *tmp_widget = new QWidget(); + QHBoxLayout *tmp_layout = new QHBoxLayout(tmp_widget); + tmp_layout->addWidget(btn_1); + tmp_layout->addWidget(btn_2); + tmp_layout->setMargin(0); + ui->tableWidget_2->setCellWidget(row,6,tmp_widget); + row++; + } +} diff --git a/softwareDirectory/AutoVerScheme/checkmethodmanage.h b/softwareDirectory/AutoVerScheme/checkmethodmanage.h index 552dd0a..c09fa85 100644 --- a/softwareDirectory/AutoVerScheme/checkmethodmanage.h +++ b/softwareDirectory/AutoVerScheme/checkmethodmanage.h @@ -2,6 +2,7 @@ #define CHECKMETHODMANAGE_H #include +#include "basecommonapi.h" namespace Ui { class CheckMethodManage; @@ -14,11 +15,15 @@ public: explicit CheckMethodManage(QWidget *parent = nullptr); ~CheckMethodManage(); + +private: + void getCheckMethod(); private slots: void showNewMethod(); private: Ui::CheckMethodManage *ui; + QList programList; }; #endif // CHECKMETHODMANAGE_H diff --git a/softwareDirectory/AutoVerScheme/AutoVerScheme.pro.user b/softwareDirectory/AutoVerScheme/AutoVerScheme.pro.user index c5290fc..a1348fb 100644 --- a/softwareDirectory/AutoVerScheme/AutoVerScheme.pro.user +++ b/softwareDirectory/AutoVerScheme/AutoVerScheme.pro.user @@ -1,6 +1,6 @@ - + EnvironmentId diff --git a/softwareDirectory/AutoVerScheme/basecommonapi.cpp b/softwareDirectory/AutoVerScheme/basecommonapi.cpp index 931a7c1..eb71984 100644 --- a/softwareDirectory/AutoVerScheme/basecommonapi.cpp +++ b/softwareDirectory/AutoVerScheme/basecommonapi.cpp @@ -738,7 +738,7 @@ } //检定程序管理首页查询 -QList getVerificationProgramInfoMain() +QList BaseCommonApi::getVerificationProgramInfoMain() { QList result; QSqlQuery query; diff --git a/softwareDirectory/AutoVerScheme/checkmethodmanage.cpp b/softwareDirectory/AutoVerScheme/checkmethodmanage.cpp index 5b7a728..f4034e2 100644 --- a/softwareDirectory/AutoVerScheme/checkmethodmanage.cpp +++ b/softwareDirectory/AutoVerScheme/checkmethodmanage.cpp @@ -7,8 +7,9 @@ ui(new Ui::CheckMethodManage) { ui->setupUi(this); - for(int i=2;i<7;i++) + for(int i=1;i<6;i++) ui->tableWidget_2->horizontalHeader()->setSectionResizeMode(i,QHeaderView::Stretch); + getCheckMethod(); } CheckMethodManage::~CheckMethodManage() @@ -24,3 +25,34 @@ checkWindow->show(); } +void CheckMethodManage::getCheckMethod() +{ + programList = BaseCommonApi::getVerificationProgramInfoMain(); + int rowCount = 0; + int row=0; + for (const VerificationProgramInfo& program : programList) { + rowCount = ui->tableWidget_2->rowCount(); + + ui->tableWidget_2->insertRow(rowCount); + ui->tableWidget_2->setItem(row, 0, new QTableWidgetItem(QString::number(row+1))); + + //ui->tableWidget->setItem(row, 0, new QTableWidgetItem(dept.id)); + ui->tableWidget_2->setItem(row, 1, new QTableWidgetItem(program.program_name)); //设置数据 + ui->tableWidget_2->setItem(row, 2, new QTableWidgetItem(program.create_name)); //设置数据 + ui->tableWidget_2->setItem(row, 3, new QTableWidgetItem(program.create_time.toString())); //设置数据 + ui->tableWidget_2->setItem(row, 4, new QTableWidgetItem(program.help_instruction)); //设置数据 + + QPushButton *btn_1 = new QPushButton(); + btn_1->setText(tr("编辑")); + QPushButton *btn_2 = new QPushButton(); + btn_2->setText(tr("删除")); + + QWidget *tmp_widget = new QWidget(); + QHBoxLayout *tmp_layout = new QHBoxLayout(tmp_widget); + tmp_layout->addWidget(btn_1); + tmp_layout->addWidget(btn_2); + tmp_layout->setMargin(0); + ui->tableWidget_2->setCellWidget(row,6,tmp_widget); + row++; + } +} diff --git a/softwareDirectory/AutoVerScheme/checkmethodmanage.h b/softwareDirectory/AutoVerScheme/checkmethodmanage.h index 552dd0a..c09fa85 100644 --- a/softwareDirectory/AutoVerScheme/checkmethodmanage.h +++ b/softwareDirectory/AutoVerScheme/checkmethodmanage.h @@ -2,6 +2,7 @@ #define CHECKMETHODMANAGE_H #include +#include "basecommonapi.h" namespace Ui { class CheckMethodManage; @@ -14,11 +15,15 @@ public: explicit CheckMethodManage(QWidget *parent = nullptr); ~CheckMethodManage(); + +private: + void getCheckMethod(); private slots: void showNewMethod(); private: Ui::CheckMethodManage *ui; + QList programList; }; #endif // CHECKMETHODMANAGE_H diff --git a/softwareDirectory/AutoVerScheme/checkmethodmanage.ui b/softwareDirectory/AutoVerScheme/checkmethodmanage.ui index 9c8dc4e..08f1a92 100644 --- a/softwareDirectory/AutoVerScheme/checkmethodmanage.ui +++ b/softwareDirectory/AutoVerScheme/checkmethodmanage.ui @@ -223,11 +223,6 @@ - 选择 - - - - 序号 diff --git a/softwareDirectory/AutoVerScheme/AutoVerScheme.pro.user b/softwareDirectory/AutoVerScheme/AutoVerScheme.pro.user index c5290fc..a1348fb 100644 --- a/softwareDirectory/AutoVerScheme/AutoVerScheme.pro.user +++ b/softwareDirectory/AutoVerScheme/AutoVerScheme.pro.user @@ -1,6 +1,6 @@ - + EnvironmentId diff --git a/softwareDirectory/AutoVerScheme/basecommonapi.cpp b/softwareDirectory/AutoVerScheme/basecommonapi.cpp index 931a7c1..eb71984 100644 --- a/softwareDirectory/AutoVerScheme/basecommonapi.cpp +++ b/softwareDirectory/AutoVerScheme/basecommonapi.cpp @@ -738,7 +738,7 @@ } //检定程序管理首页查询 -QList getVerificationProgramInfoMain() +QList BaseCommonApi::getVerificationProgramInfoMain() { QList result; QSqlQuery query; diff --git a/softwareDirectory/AutoVerScheme/checkmethodmanage.cpp b/softwareDirectory/AutoVerScheme/checkmethodmanage.cpp index 5b7a728..f4034e2 100644 --- a/softwareDirectory/AutoVerScheme/checkmethodmanage.cpp +++ b/softwareDirectory/AutoVerScheme/checkmethodmanage.cpp @@ -7,8 +7,9 @@ ui(new Ui::CheckMethodManage) { ui->setupUi(this); - for(int i=2;i<7;i++) + for(int i=1;i<6;i++) ui->tableWidget_2->horizontalHeader()->setSectionResizeMode(i,QHeaderView::Stretch); + getCheckMethod(); } CheckMethodManage::~CheckMethodManage() @@ -24,3 +25,34 @@ checkWindow->show(); } +void CheckMethodManage::getCheckMethod() +{ + programList = BaseCommonApi::getVerificationProgramInfoMain(); + int rowCount = 0; + int row=0; + for (const VerificationProgramInfo& program : programList) { + rowCount = ui->tableWidget_2->rowCount(); + + ui->tableWidget_2->insertRow(rowCount); + ui->tableWidget_2->setItem(row, 0, new QTableWidgetItem(QString::number(row+1))); + + //ui->tableWidget->setItem(row, 0, new QTableWidgetItem(dept.id)); + ui->tableWidget_2->setItem(row, 1, new QTableWidgetItem(program.program_name)); //设置数据 + ui->tableWidget_2->setItem(row, 2, new QTableWidgetItem(program.create_name)); //设置数据 + ui->tableWidget_2->setItem(row, 3, new QTableWidgetItem(program.create_time.toString())); //设置数据 + ui->tableWidget_2->setItem(row, 4, new QTableWidgetItem(program.help_instruction)); //设置数据 + + QPushButton *btn_1 = new QPushButton(); + btn_1->setText(tr("编辑")); + QPushButton *btn_2 = new QPushButton(); + btn_2->setText(tr("删除")); + + QWidget *tmp_widget = new QWidget(); + QHBoxLayout *tmp_layout = new QHBoxLayout(tmp_widget); + tmp_layout->addWidget(btn_1); + tmp_layout->addWidget(btn_2); + tmp_layout->setMargin(0); + ui->tableWidget_2->setCellWidget(row,6,tmp_widget); + row++; + } +} diff --git a/softwareDirectory/AutoVerScheme/checkmethodmanage.h b/softwareDirectory/AutoVerScheme/checkmethodmanage.h index 552dd0a..c09fa85 100644 --- a/softwareDirectory/AutoVerScheme/checkmethodmanage.h +++ b/softwareDirectory/AutoVerScheme/checkmethodmanage.h @@ -2,6 +2,7 @@ #define CHECKMETHODMANAGE_H #include +#include "basecommonapi.h" namespace Ui { class CheckMethodManage; @@ -14,11 +15,15 @@ public: explicit CheckMethodManage(QWidget *parent = nullptr); ~CheckMethodManage(); + +private: + void getCheckMethod(); private slots: void showNewMethod(); private: Ui::CheckMethodManage *ui; + QList programList; }; #endif // CHECKMETHODMANAGE_H diff --git a/softwareDirectory/AutoVerScheme/checkmethodmanage.ui b/softwareDirectory/AutoVerScheme/checkmethodmanage.ui index 9c8dc4e..08f1a92 100644 --- a/softwareDirectory/AutoVerScheme/checkmethodmanage.ui +++ b/softwareDirectory/AutoVerScheme/checkmethodmanage.ui @@ -223,11 +223,6 @@ - 选择 - - - - 序号 diff --git a/softwareDirectory/AutoVerScheme/databaseconnection.cpp b/softwareDirectory/AutoVerScheme/databaseconnection.cpp index e74cf5e..2d50c6d 100644 --- a/softwareDirectory/AutoVerScheme/databaseconnection.cpp +++ b/softwareDirectory/AutoVerScheme/databaseconnection.cpp @@ -9,11 +9,16 @@ // 连接数据库 db = QSqlDatabase::addDatabase("QODBC"); - db.setHostName("111.198.10.15"); + /*db.setHostName("111.198.10.15"); db.setDatabaseName("casic_metering_xichang"); db.setPort(21906); db.setUserName("zdjdcs"); - db.setPassword("11111111"); + db.setPassword("11111111");*/ + db.setHostName("localhost"); + db.setDatabaseName("casic_metering_xichang"); + db.setPort(3306); + db.setUserName("root"); + db.setPassword("123456"); } diff --git a/softwareDirectory/AutoVerScheme/AutoVerScheme.pro.user b/softwareDirectory/AutoVerScheme/AutoVerScheme.pro.user index c5290fc..a1348fb 100644 --- a/softwareDirectory/AutoVerScheme/AutoVerScheme.pro.user +++ b/softwareDirectory/AutoVerScheme/AutoVerScheme.pro.user @@ -1,6 +1,6 @@ - + EnvironmentId diff --git a/softwareDirectory/AutoVerScheme/basecommonapi.cpp b/softwareDirectory/AutoVerScheme/basecommonapi.cpp index 931a7c1..eb71984 100644 --- a/softwareDirectory/AutoVerScheme/basecommonapi.cpp +++ b/softwareDirectory/AutoVerScheme/basecommonapi.cpp @@ -738,7 +738,7 @@ } //检定程序管理首页查询 -QList getVerificationProgramInfoMain() +QList BaseCommonApi::getVerificationProgramInfoMain() { QList result; QSqlQuery query; diff --git a/softwareDirectory/AutoVerScheme/checkmethodmanage.cpp b/softwareDirectory/AutoVerScheme/checkmethodmanage.cpp index 5b7a728..f4034e2 100644 --- a/softwareDirectory/AutoVerScheme/checkmethodmanage.cpp +++ b/softwareDirectory/AutoVerScheme/checkmethodmanage.cpp @@ -7,8 +7,9 @@ ui(new Ui::CheckMethodManage) { ui->setupUi(this); - for(int i=2;i<7;i++) + for(int i=1;i<6;i++) ui->tableWidget_2->horizontalHeader()->setSectionResizeMode(i,QHeaderView::Stretch); + getCheckMethod(); } CheckMethodManage::~CheckMethodManage() @@ -24,3 +25,34 @@ checkWindow->show(); } +void CheckMethodManage::getCheckMethod() +{ + programList = BaseCommonApi::getVerificationProgramInfoMain(); + int rowCount = 0; + int row=0; + for (const VerificationProgramInfo& program : programList) { + rowCount = ui->tableWidget_2->rowCount(); + + ui->tableWidget_2->insertRow(rowCount); + ui->tableWidget_2->setItem(row, 0, new QTableWidgetItem(QString::number(row+1))); + + //ui->tableWidget->setItem(row, 0, new QTableWidgetItem(dept.id)); + ui->tableWidget_2->setItem(row, 1, new QTableWidgetItem(program.program_name)); //设置数据 + ui->tableWidget_2->setItem(row, 2, new QTableWidgetItem(program.create_name)); //设置数据 + ui->tableWidget_2->setItem(row, 3, new QTableWidgetItem(program.create_time.toString())); //设置数据 + ui->tableWidget_2->setItem(row, 4, new QTableWidgetItem(program.help_instruction)); //设置数据 + + QPushButton *btn_1 = new QPushButton(); + btn_1->setText(tr("编辑")); + QPushButton *btn_2 = new QPushButton(); + btn_2->setText(tr("删除")); + + QWidget *tmp_widget = new QWidget(); + QHBoxLayout *tmp_layout = new QHBoxLayout(tmp_widget); + tmp_layout->addWidget(btn_1); + tmp_layout->addWidget(btn_2); + tmp_layout->setMargin(0); + ui->tableWidget_2->setCellWidget(row,6,tmp_widget); + row++; + } +} diff --git a/softwareDirectory/AutoVerScheme/checkmethodmanage.h b/softwareDirectory/AutoVerScheme/checkmethodmanage.h index 552dd0a..c09fa85 100644 --- a/softwareDirectory/AutoVerScheme/checkmethodmanage.h +++ b/softwareDirectory/AutoVerScheme/checkmethodmanage.h @@ -2,6 +2,7 @@ #define CHECKMETHODMANAGE_H #include +#include "basecommonapi.h" namespace Ui { class CheckMethodManage; @@ -14,11 +15,15 @@ public: explicit CheckMethodManage(QWidget *parent = nullptr); ~CheckMethodManage(); + +private: + void getCheckMethod(); private slots: void showNewMethod(); private: Ui::CheckMethodManage *ui; + QList programList; }; #endif // CHECKMETHODMANAGE_H diff --git a/softwareDirectory/AutoVerScheme/checkmethodmanage.ui b/softwareDirectory/AutoVerScheme/checkmethodmanage.ui index 9c8dc4e..08f1a92 100644 --- a/softwareDirectory/AutoVerScheme/checkmethodmanage.ui +++ b/softwareDirectory/AutoVerScheme/checkmethodmanage.ui @@ -223,11 +223,6 @@ - 选择 - - - - 序号 diff --git a/softwareDirectory/AutoVerScheme/databaseconnection.cpp b/softwareDirectory/AutoVerScheme/databaseconnection.cpp index e74cf5e..2d50c6d 100644 --- a/softwareDirectory/AutoVerScheme/databaseconnection.cpp +++ b/softwareDirectory/AutoVerScheme/databaseconnection.cpp @@ -9,11 +9,16 @@ // 连接数据库 db = QSqlDatabase::addDatabase("QODBC"); - db.setHostName("111.198.10.15"); + /*db.setHostName("111.198.10.15"); db.setDatabaseName("casic_metering_xichang"); db.setPort(21906); db.setUserName("zdjdcs"); - db.setPassword("11111111"); + db.setPassword("11111111");*/ + db.setHostName("localhost"); + db.setDatabaseName("casic_metering_xichang"); + db.setPort(3306); + db.setUserName("root"); + db.setPassword("123456"); } diff --git a/softwareDirectory/AutoVerScheme/newcheckmethod.cpp b/softwareDirectory/AutoVerScheme/newcheckmethod.cpp index eee7e48..90288ab 100644 --- a/softwareDirectory/AutoVerScheme/newcheckmethod.cpp +++ b/softwareDirectory/AutoVerScheme/newcheckmethod.cpp @@ -3,6 +3,8 @@ #include "checkdevice.h" #include "qfiledialog.h" #include "formcheckpoint.h" +#include +#include NewCheckMethod::NewCheckMethod(QWidget *parent) : QWidget(parent), @@ -35,11 +37,13 @@ QImage scalimg = img.scaled(ui->label_11->size(), Qt::KeepAspectRatio, Qt::SmoothTransformation); ui->label_11->setPixmap(QPixmap::fromImage(scalimg)); //ui->label_11->setPixmap(QPixmap(sName)); + programInfo.img_path = sName; } void NewCheckMethod::deletePicture() { ui->label_11->clear(); + programInfo.img_path = ""; } void NewCheckMethod::showCheckPoint() @@ -49,3 +53,28 @@ checkWindow->setWindowModality(Qt::ApplicationModal); checkWindow->show(); } + +void NewCheckMethod::on_pushButton_3_clicked() +{ + BaseCommonApi baseApi; + qint64 id = baseApi.generateId(); + programInfo.id = QString::number(id); + programInfo.program_name = ui->lineEditName->text(); + programInfo.create_name = ui->lineEditUser->text(); + programInfo.create_time = ui->dateEditTime->dateTime(); + programInfo.remark = ui->lineEditMark->text(); + + qDebug() << "programInfo.id" << programInfo.id ; + + if(BaseCommonApi::InsertVerificationProgramInfo(programInfo)) + { + this->close(); + }else{ + QMessageBox::warning(this, "警告", "保存失败!"); + } +} + +void NewCheckMethod::on_pushButton_4_clicked() +{ + this->close(); +} diff --git a/softwareDirectory/AutoVerScheme/AutoVerScheme.pro.user b/softwareDirectory/AutoVerScheme/AutoVerScheme.pro.user index c5290fc..a1348fb 100644 --- a/softwareDirectory/AutoVerScheme/AutoVerScheme.pro.user +++ b/softwareDirectory/AutoVerScheme/AutoVerScheme.pro.user @@ -1,6 +1,6 @@ - + EnvironmentId diff --git a/softwareDirectory/AutoVerScheme/basecommonapi.cpp b/softwareDirectory/AutoVerScheme/basecommonapi.cpp index 931a7c1..eb71984 100644 --- a/softwareDirectory/AutoVerScheme/basecommonapi.cpp +++ b/softwareDirectory/AutoVerScheme/basecommonapi.cpp @@ -738,7 +738,7 @@ } //检定程序管理首页查询 -QList getVerificationProgramInfoMain() +QList BaseCommonApi::getVerificationProgramInfoMain() { QList result; QSqlQuery query; diff --git a/softwareDirectory/AutoVerScheme/checkmethodmanage.cpp b/softwareDirectory/AutoVerScheme/checkmethodmanage.cpp index 5b7a728..f4034e2 100644 --- a/softwareDirectory/AutoVerScheme/checkmethodmanage.cpp +++ b/softwareDirectory/AutoVerScheme/checkmethodmanage.cpp @@ -7,8 +7,9 @@ ui(new Ui::CheckMethodManage) { ui->setupUi(this); - for(int i=2;i<7;i++) + for(int i=1;i<6;i++) ui->tableWidget_2->horizontalHeader()->setSectionResizeMode(i,QHeaderView::Stretch); + getCheckMethod(); } CheckMethodManage::~CheckMethodManage() @@ -24,3 +25,34 @@ checkWindow->show(); } +void CheckMethodManage::getCheckMethod() +{ + programList = BaseCommonApi::getVerificationProgramInfoMain(); + int rowCount = 0; + int row=0; + for (const VerificationProgramInfo& program : programList) { + rowCount = ui->tableWidget_2->rowCount(); + + ui->tableWidget_2->insertRow(rowCount); + ui->tableWidget_2->setItem(row, 0, new QTableWidgetItem(QString::number(row+1))); + + //ui->tableWidget->setItem(row, 0, new QTableWidgetItem(dept.id)); + ui->tableWidget_2->setItem(row, 1, new QTableWidgetItem(program.program_name)); //设置数据 + ui->tableWidget_2->setItem(row, 2, new QTableWidgetItem(program.create_name)); //设置数据 + ui->tableWidget_2->setItem(row, 3, new QTableWidgetItem(program.create_time.toString())); //设置数据 + ui->tableWidget_2->setItem(row, 4, new QTableWidgetItem(program.help_instruction)); //设置数据 + + QPushButton *btn_1 = new QPushButton(); + btn_1->setText(tr("编辑")); + QPushButton *btn_2 = new QPushButton(); + btn_2->setText(tr("删除")); + + QWidget *tmp_widget = new QWidget(); + QHBoxLayout *tmp_layout = new QHBoxLayout(tmp_widget); + tmp_layout->addWidget(btn_1); + tmp_layout->addWidget(btn_2); + tmp_layout->setMargin(0); + ui->tableWidget_2->setCellWidget(row,6,tmp_widget); + row++; + } +} diff --git a/softwareDirectory/AutoVerScheme/checkmethodmanage.h b/softwareDirectory/AutoVerScheme/checkmethodmanage.h index 552dd0a..c09fa85 100644 --- a/softwareDirectory/AutoVerScheme/checkmethodmanage.h +++ b/softwareDirectory/AutoVerScheme/checkmethodmanage.h @@ -2,6 +2,7 @@ #define CHECKMETHODMANAGE_H #include +#include "basecommonapi.h" namespace Ui { class CheckMethodManage; @@ -14,11 +15,15 @@ public: explicit CheckMethodManage(QWidget *parent = nullptr); ~CheckMethodManage(); + +private: + void getCheckMethod(); private slots: void showNewMethod(); private: Ui::CheckMethodManage *ui; + QList programList; }; #endif // CHECKMETHODMANAGE_H diff --git a/softwareDirectory/AutoVerScheme/checkmethodmanage.ui b/softwareDirectory/AutoVerScheme/checkmethodmanage.ui index 9c8dc4e..08f1a92 100644 --- a/softwareDirectory/AutoVerScheme/checkmethodmanage.ui +++ b/softwareDirectory/AutoVerScheme/checkmethodmanage.ui @@ -223,11 +223,6 @@ - 选择 - - - - 序号 diff --git a/softwareDirectory/AutoVerScheme/databaseconnection.cpp b/softwareDirectory/AutoVerScheme/databaseconnection.cpp index e74cf5e..2d50c6d 100644 --- a/softwareDirectory/AutoVerScheme/databaseconnection.cpp +++ b/softwareDirectory/AutoVerScheme/databaseconnection.cpp @@ -9,11 +9,16 @@ // 连接数据库 db = QSqlDatabase::addDatabase("QODBC"); - db.setHostName("111.198.10.15"); + /*db.setHostName("111.198.10.15"); db.setDatabaseName("casic_metering_xichang"); db.setPort(21906); db.setUserName("zdjdcs"); - db.setPassword("11111111"); + db.setPassword("11111111");*/ + db.setHostName("localhost"); + db.setDatabaseName("casic_metering_xichang"); + db.setPort(3306); + db.setUserName("root"); + db.setPassword("123456"); } diff --git a/softwareDirectory/AutoVerScheme/newcheckmethod.cpp b/softwareDirectory/AutoVerScheme/newcheckmethod.cpp index eee7e48..90288ab 100644 --- a/softwareDirectory/AutoVerScheme/newcheckmethod.cpp +++ b/softwareDirectory/AutoVerScheme/newcheckmethod.cpp @@ -3,6 +3,8 @@ #include "checkdevice.h" #include "qfiledialog.h" #include "formcheckpoint.h" +#include +#include NewCheckMethod::NewCheckMethod(QWidget *parent) : QWidget(parent), @@ -35,11 +37,13 @@ QImage scalimg = img.scaled(ui->label_11->size(), Qt::KeepAspectRatio, Qt::SmoothTransformation); ui->label_11->setPixmap(QPixmap::fromImage(scalimg)); //ui->label_11->setPixmap(QPixmap(sName)); + programInfo.img_path = sName; } void NewCheckMethod::deletePicture() { ui->label_11->clear(); + programInfo.img_path = ""; } void NewCheckMethod::showCheckPoint() @@ -49,3 +53,28 @@ checkWindow->setWindowModality(Qt::ApplicationModal); checkWindow->show(); } + +void NewCheckMethod::on_pushButton_3_clicked() +{ + BaseCommonApi baseApi; + qint64 id = baseApi.generateId(); + programInfo.id = QString::number(id); + programInfo.program_name = ui->lineEditName->text(); + programInfo.create_name = ui->lineEditUser->text(); + programInfo.create_time = ui->dateEditTime->dateTime(); + programInfo.remark = ui->lineEditMark->text(); + + qDebug() << "programInfo.id" << programInfo.id ; + + if(BaseCommonApi::InsertVerificationProgramInfo(programInfo)) + { + this->close(); + }else{ + QMessageBox::warning(this, "警告", "保存失败!"); + } +} + +void NewCheckMethod::on_pushButton_4_clicked() +{ + this->close(); +} diff --git a/softwareDirectory/AutoVerScheme/newcheckmethod.h b/softwareDirectory/AutoVerScheme/newcheckmethod.h index 8a26b0f..048f5e0 100644 --- a/softwareDirectory/AutoVerScheme/newcheckmethod.h +++ b/softwareDirectory/AutoVerScheme/newcheckmethod.h @@ -2,6 +2,7 @@ #define NEWCHECKMETHOD_H #include +#include "basecommonapi.h" namespace Ui { class NewCheckMethod; @@ -20,8 +21,13 @@ void deletePicture(); void showCheckPoint(); + void on_pushButton_3_clicked(); + + void on_pushButton_4_clicked(); + private: Ui::NewCheckMethod *ui; + VerificationProgramInfo programInfo; }; #endif // NEWCHECKMETHOD_H diff --git a/softwareDirectory/AutoVerScheme/AutoVerScheme.pro.user b/softwareDirectory/AutoVerScheme/AutoVerScheme.pro.user index c5290fc..a1348fb 100644 --- a/softwareDirectory/AutoVerScheme/AutoVerScheme.pro.user +++ b/softwareDirectory/AutoVerScheme/AutoVerScheme.pro.user @@ -1,6 +1,6 @@ - + EnvironmentId diff --git a/softwareDirectory/AutoVerScheme/basecommonapi.cpp b/softwareDirectory/AutoVerScheme/basecommonapi.cpp index 931a7c1..eb71984 100644 --- a/softwareDirectory/AutoVerScheme/basecommonapi.cpp +++ b/softwareDirectory/AutoVerScheme/basecommonapi.cpp @@ -738,7 +738,7 @@ } //检定程序管理首页查询 -QList getVerificationProgramInfoMain() +QList BaseCommonApi::getVerificationProgramInfoMain() { QList result; QSqlQuery query; diff --git a/softwareDirectory/AutoVerScheme/checkmethodmanage.cpp b/softwareDirectory/AutoVerScheme/checkmethodmanage.cpp index 5b7a728..f4034e2 100644 --- a/softwareDirectory/AutoVerScheme/checkmethodmanage.cpp +++ b/softwareDirectory/AutoVerScheme/checkmethodmanage.cpp @@ -7,8 +7,9 @@ ui(new Ui::CheckMethodManage) { ui->setupUi(this); - for(int i=2;i<7;i++) + for(int i=1;i<6;i++) ui->tableWidget_2->horizontalHeader()->setSectionResizeMode(i,QHeaderView::Stretch); + getCheckMethod(); } CheckMethodManage::~CheckMethodManage() @@ -24,3 +25,34 @@ checkWindow->show(); } +void CheckMethodManage::getCheckMethod() +{ + programList = BaseCommonApi::getVerificationProgramInfoMain(); + int rowCount = 0; + int row=0; + for (const VerificationProgramInfo& program : programList) { + rowCount = ui->tableWidget_2->rowCount(); + + ui->tableWidget_2->insertRow(rowCount); + ui->tableWidget_2->setItem(row, 0, new QTableWidgetItem(QString::number(row+1))); + + //ui->tableWidget->setItem(row, 0, new QTableWidgetItem(dept.id)); + ui->tableWidget_2->setItem(row, 1, new QTableWidgetItem(program.program_name)); //设置数据 + ui->tableWidget_2->setItem(row, 2, new QTableWidgetItem(program.create_name)); //设置数据 + ui->tableWidget_2->setItem(row, 3, new QTableWidgetItem(program.create_time.toString())); //设置数据 + ui->tableWidget_2->setItem(row, 4, new QTableWidgetItem(program.help_instruction)); //设置数据 + + QPushButton *btn_1 = new QPushButton(); + btn_1->setText(tr("编辑")); + QPushButton *btn_2 = new QPushButton(); + btn_2->setText(tr("删除")); + + QWidget *tmp_widget = new QWidget(); + QHBoxLayout *tmp_layout = new QHBoxLayout(tmp_widget); + tmp_layout->addWidget(btn_1); + tmp_layout->addWidget(btn_2); + tmp_layout->setMargin(0); + ui->tableWidget_2->setCellWidget(row,6,tmp_widget); + row++; + } +} diff --git a/softwareDirectory/AutoVerScheme/checkmethodmanage.h b/softwareDirectory/AutoVerScheme/checkmethodmanage.h index 552dd0a..c09fa85 100644 --- a/softwareDirectory/AutoVerScheme/checkmethodmanage.h +++ b/softwareDirectory/AutoVerScheme/checkmethodmanage.h @@ -2,6 +2,7 @@ #define CHECKMETHODMANAGE_H #include +#include "basecommonapi.h" namespace Ui { class CheckMethodManage; @@ -14,11 +15,15 @@ public: explicit CheckMethodManage(QWidget *parent = nullptr); ~CheckMethodManage(); + +private: + void getCheckMethod(); private slots: void showNewMethod(); private: Ui::CheckMethodManage *ui; + QList programList; }; #endif // CHECKMETHODMANAGE_H diff --git a/softwareDirectory/AutoVerScheme/checkmethodmanage.ui b/softwareDirectory/AutoVerScheme/checkmethodmanage.ui index 9c8dc4e..08f1a92 100644 --- a/softwareDirectory/AutoVerScheme/checkmethodmanage.ui +++ b/softwareDirectory/AutoVerScheme/checkmethodmanage.ui @@ -223,11 +223,6 @@ - 选择 - - - - 序号 diff --git a/softwareDirectory/AutoVerScheme/databaseconnection.cpp b/softwareDirectory/AutoVerScheme/databaseconnection.cpp index e74cf5e..2d50c6d 100644 --- a/softwareDirectory/AutoVerScheme/databaseconnection.cpp +++ b/softwareDirectory/AutoVerScheme/databaseconnection.cpp @@ -9,11 +9,16 @@ // 连接数据库 db = QSqlDatabase::addDatabase("QODBC"); - db.setHostName("111.198.10.15"); + /*db.setHostName("111.198.10.15"); db.setDatabaseName("casic_metering_xichang"); db.setPort(21906); db.setUserName("zdjdcs"); - db.setPassword("11111111"); + db.setPassword("11111111");*/ + db.setHostName("localhost"); + db.setDatabaseName("casic_metering_xichang"); + db.setPort(3306); + db.setUserName("root"); + db.setPassword("123456"); } diff --git a/softwareDirectory/AutoVerScheme/newcheckmethod.cpp b/softwareDirectory/AutoVerScheme/newcheckmethod.cpp index eee7e48..90288ab 100644 --- a/softwareDirectory/AutoVerScheme/newcheckmethod.cpp +++ b/softwareDirectory/AutoVerScheme/newcheckmethod.cpp @@ -3,6 +3,8 @@ #include "checkdevice.h" #include "qfiledialog.h" #include "formcheckpoint.h" +#include +#include NewCheckMethod::NewCheckMethod(QWidget *parent) : QWidget(parent), @@ -35,11 +37,13 @@ QImage scalimg = img.scaled(ui->label_11->size(), Qt::KeepAspectRatio, Qt::SmoothTransformation); ui->label_11->setPixmap(QPixmap::fromImage(scalimg)); //ui->label_11->setPixmap(QPixmap(sName)); + programInfo.img_path = sName; } void NewCheckMethod::deletePicture() { ui->label_11->clear(); + programInfo.img_path = ""; } void NewCheckMethod::showCheckPoint() @@ -49,3 +53,28 @@ checkWindow->setWindowModality(Qt::ApplicationModal); checkWindow->show(); } + +void NewCheckMethod::on_pushButton_3_clicked() +{ + BaseCommonApi baseApi; + qint64 id = baseApi.generateId(); + programInfo.id = QString::number(id); + programInfo.program_name = ui->lineEditName->text(); + programInfo.create_name = ui->lineEditUser->text(); + programInfo.create_time = ui->dateEditTime->dateTime(); + programInfo.remark = ui->lineEditMark->text(); + + qDebug() << "programInfo.id" << programInfo.id ; + + if(BaseCommonApi::InsertVerificationProgramInfo(programInfo)) + { + this->close(); + }else{ + QMessageBox::warning(this, "警告", "保存失败!"); + } +} + +void NewCheckMethod::on_pushButton_4_clicked() +{ + this->close(); +} diff --git a/softwareDirectory/AutoVerScheme/newcheckmethod.h b/softwareDirectory/AutoVerScheme/newcheckmethod.h index 8a26b0f..048f5e0 100644 --- a/softwareDirectory/AutoVerScheme/newcheckmethod.h +++ b/softwareDirectory/AutoVerScheme/newcheckmethod.h @@ -2,6 +2,7 @@ #define NEWCHECKMETHOD_H #include +#include "basecommonapi.h" namespace Ui { class NewCheckMethod; @@ -20,8 +21,13 @@ void deletePicture(); void showCheckPoint(); + void on_pushButton_3_clicked(); + + void on_pushButton_4_clicked(); + private: Ui::NewCheckMethod *ui; + VerificationProgramInfo programInfo; }; #endif // NEWCHECKMETHOD_H diff --git a/softwareDirectory/AutoVerScheme/newcheckmethod.ui b/softwareDirectory/AutoVerScheme/newcheckmethod.ui index 27a8951..5a3a031 100644 --- a/softwareDirectory/AutoVerScheme/newcheckmethod.ui +++ b/softwareDirectory/AutoVerScheme/newcheckmethod.ui @@ -132,7 +132,7 @@ - + 12 @@ -155,7 +155,7 @@ - + 12 @@ -178,7 +178,7 @@ - + 12 @@ -201,7 +201,7 @@ - + 12 @@ -568,7 +568,7 @@ 1304 - 257 + 233 1333 @@ -583,8 +583,8 @@ choosePicture() - 394 - 222 + 413 + 202 266 @@ -600,7 +600,7 @@ 513 - 222 + 202 385