diff --git a/softwareDirectory/AutoVerScheme/AutoVerScheme.pro b/softwareDirectory/AutoVerScheme/AutoVerScheme.pro
index 122d6ca..5bd9a15 100644
--- a/softwareDirectory/AutoVerScheme/AutoVerScheme.pro
+++ b/softwareDirectory/AutoVerScheme/AutoVerScheme.pro
@@ -49,6 +49,7 @@
standard_deviceitem.cpp \
testdataitem.cpp \
testview.cpp \
+ verifydevice.cpp \
verifymethodmanage.cpp \
verifywindow.cpp \
visacommonengine.cpp \
@@ -88,6 +89,7 @@
standard_deviceitem.h \
testdataitem.h \
testview.h \
+ verifydevice.h \
verifymethodmanage.h \
verifywindow.h\
biz_device_manage_serve.h \
@@ -114,6 +116,7 @@
standard_deviceitem.ui \
testdataitem.ui \
testview.ui \
+ verifydevice.ui \
verifymethodmanage.ui \
verifywindow.ui
diff --git a/softwareDirectory/AutoVerScheme/AutoVerScheme.pro b/softwareDirectory/AutoVerScheme/AutoVerScheme.pro
index 122d6ca..5bd9a15 100644
--- a/softwareDirectory/AutoVerScheme/AutoVerScheme.pro
+++ b/softwareDirectory/AutoVerScheme/AutoVerScheme.pro
@@ -49,6 +49,7 @@
standard_deviceitem.cpp \
testdataitem.cpp \
testview.cpp \
+ verifydevice.cpp \
verifymethodmanage.cpp \
verifywindow.cpp \
visacommonengine.cpp \
@@ -88,6 +89,7 @@
standard_deviceitem.h \
testdataitem.h \
testview.h \
+ verifydevice.h \
verifymethodmanage.h \
verifywindow.h\
biz_device_manage_serve.h \
@@ -114,6 +116,7 @@
standard_deviceitem.ui \
testdataitem.ui \
testview.ui \
+ verifydevice.ui \
verifymethodmanage.ui \
verifywindow.ui
diff --git a/softwareDirectory/AutoVerScheme/AutoVerScheme.pro.user b/softwareDirectory/AutoVerScheme/AutoVerScheme.pro.user
index 76c04be..39bcba0 100644
--- a/softwareDirectory/AutoVerScheme/AutoVerScheme.pro.user
+++ b/softwareDirectory/AutoVerScheme/AutoVerScheme.pro.user
@@ -1,6 +1,6 @@
-
+
EnvironmentId
@@ -574,6 +574,6 @@
Version
- 22
+ 22
diff --git a/softwareDirectory/AutoVerScheme/AutoVerScheme.pro b/softwareDirectory/AutoVerScheme/AutoVerScheme.pro
index 122d6ca..5bd9a15 100644
--- a/softwareDirectory/AutoVerScheme/AutoVerScheme.pro
+++ b/softwareDirectory/AutoVerScheme/AutoVerScheme.pro
@@ -49,6 +49,7 @@
standard_deviceitem.cpp \
testdataitem.cpp \
testview.cpp \
+ verifydevice.cpp \
verifymethodmanage.cpp \
verifywindow.cpp \
visacommonengine.cpp \
@@ -88,6 +89,7 @@
standard_deviceitem.h \
testdataitem.h \
testview.h \
+ verifydevice.h \
verifymethodmanage.h \
verifywindow.h\
biz_device_manage_serve.h \
@@ -114,6 +116,7 @@
standard_deviceitem.ui \
testdataitem.ui \
testview.ui \
+ verifydevice.ui \
verifymethodmanage.ui \
verifywindow.ui
diff --git a/softwareDirectory/AutoVerScheme/AutoVerScheme.pro.user b/softwareDirectory/AutoVerScheme/AutoVerScheme.pro.user
index 76c04be..39bcba0 100644
--- a/softwareDirectory/AutoVerScheme/AutoVerScheme.pro.user
+++ b/softwareDirectory/AutoVerScheme/AutoVerScheme.pro.user
@@ -1,6 +1,6 @@
-
+
EnvironmentId
@@ -574,6 +574,6 @@
Version
- 22
+ 22
diff --git a/softwareDirectory/AutoVerScheme/checkwindow.cpp b/softwareDirectory/AutoVerScheme/checkwindow.cpp
index 9b97f91..25134ba 100644
--- a/softwareDirectory/AutoVerScheme/checkwindow.cpp
+++ b/softwareDirectory/AutoVerScheme/checkwindow.cpp
@@ -2,6 +2,7 @@
#include "ui_checkwindow.h"
#include "dialogcheckresult.h"
#include
+#include "my_tasks_serve.h"
#include "basecommonapi.h"
CheckWindow::CheckWindow(QWidget *parent) :
@@ -57,23 +58,31 @@
void CheckWindow::getCheckDevice()
{
- QList data = BaseCommonApi::getTestedDevice();
+ MyTasks dbManager;
+ // 调用数据库管理器的函数获取数据
+ //模拟用户ID
+ QString userId="1640229293790650370";
+ QList data = dbManager.getMyTasks(userId);
int rowCount = 0;
int row=0;
QString State;
- for (const TestedDevice& device : data) {
- rowCount = ui->tableWidgetDevice->rowCount();
- ui->tableWidgetDevice->insertRow(rowCount);
- ui->tableWidgetDevice->setItem(row, 1, new QTableWidgetItem(QString::number(row+1)));
- ui->tableWidgetDevice->setItem(row, 2, new QTableWidgetItem(device.equipment_name)); //设置数据
- ui->tableWidgetDevice->setItem(row, 3, new QTableWidgetItem(device.model)); //设置数据
- ui->tableWidgetDevice->setItem(row, 4, new QTableWidgetItem(device.help_instruction)); //设置数据
- ui->tableWidgetDevice->setItem(row, 5, new QTableWidgetItem(device.manufacture_no)); //设置数据
- ui->tableWidgetDevice->setItem(row, 6, new QTableWidgetItem(device.manufacturer)); //设置数据
- ui->tableWidgetDevice->setItem(row, 7, new QTableWidgetItem(device.meter_identify)); //设置数据
- //QDebug
- row++;
+ for (const MyTask& myTask : data) {
+ rowCount = ui->tableWidgetDevice->rowCount();
+ ui->tableWidgetDevice->insertRow(rowCount);
+ QTableWidgetItem* p_check = new QTableWidgetItem();
+ p_check->setCheckState(Qt::Unchecked); //设置首列为 CheckBox 控件
+ ui->tableWidgetDevice->setItem(row,0,p_check);
+
+ ui->tableWidgetDevice->setItem(row, 1, new QTableWidgetItem(QString::number(row+1)));
+ //ui->tableWidget->setItem(row, 0, new QTableWidgetItem(dept.id));
+ ui->tableWidgetDevice->setItem(row, 2, new QTableWidgetItem(myTask.sample_name)); //设置数据
+ ui->tableWidgetDevice->setItem(row, 3, new QTableWidgetItem(myTask.sample_model)); //设置数据
+ ui->tableWidgetDevice->setItem(row, 4, new QTableWidgetItem(myTask.help_instruction)); //设置数据
+ ui->tableWidgetDevice->setItem(row, 5, new QTableWidgetItem(myTask.manufacture_no)); //设置数据
+ ui->tableWidgetDevice->setItem(row, 6, new QTableWidgetItem(myTask.manufacturer)); //设置数据
+ ui->tableWidgetDevice->setItem(row, 7, new QTableWidgetItem(myTask.customer_name)); //设置数据
+ row++;
}
}
diff --git a/softwareDirectory/AutoVerScheme/AutoVerScheme.pro b/softwareDirectory/AutoVerScheme/AutoVerScheme.pro
index 122d6ca..5bd9a15 100644
--- a/softwareDirectory/AutoVerScheme/AutoVerScheme.pro
+++ b/softwareDirectory/AutoVerScheme/AutoVerScheme.pro
@@ -49,6 +49,7 @@
standard_deviceitem.cpp \
testdataitem.cpp \
testview.cpp \
+ verifydevice.cpp \
verifymethodmanage.cpp \
verifywindow.cpp \
visacommonengine.cpp \
@@ -88,6 +89,7 @@
standard_deviceitem.h \
testdataitem.h \
testview.h \
+ verifydevice.h \
verifymethodmanage.h \
verifywindow.h\
biz_device_manage_serve.h \
@@ -114,6 +116,7 @@
standard_deviceitem.ui \
testdataitem.ui \
testview.ui \
+ verifydevice.ui \
verifymethodmanage.ui \
verifywindow.ui
diff --git a/softwareDirectory/AutoVerScheme/AutoVerScheme.pro.user b/softwareDirectory/AutoVerScheme/AutoVerScheme.pro.user
index 76c04be..39bcba0 100644
--- a/softwareDirectory/AutoVerScheme/AutoVerScheme.pro.user
+++ b/softwareDirectory/AutoVerScheme/AutoVerScheme.pro.user
@@ -1,6 +1,6 @@
-
+
EnvironmentId
@@ -574,6 +574,6 @@
Version
- 22
+ 22
diff --git a/softwareDirectory/AutoVerScheme/checkwindow.cpp b/softwareDirectory/AutoVerScheme/checkwindow.cpp
index 9b97f91..25134ba 100644
--- a/softwareDirectory/AutoVerScheme/checkwindow.cpp
+++ b/softwareDirectory/AutoVerScheme/checkwindow.cpp
@@ -2,6 +2,7 @@
#include "ui_checkwindow.h"
#include "dialogcheckresult.h"
#include
+#include "my_tasks_serve.h"
#include "basecommonapi.h"
CheckWindow::CheckWindow(QWidget *parent) :
@@ -57,23 +58,31 @@
void CheckWindow::getCheckDevice()
{
- QList data = BaseCommonApi::getTestedDevice();
+ MyTasks dbManager;
+ // 调用数据库管理器的函数获取数据
+ //模拟用户ID
+ QString userId="1640229293790650370";
+ QList data = dbManager.getMyTasks(userId);
int rowCount = 0;
int row=0;
QString State;
- for (const TestedDevice& device : data) {
- rowCount = ui->tableWidgetDevice->rowCount();
- ui->tableWidgetDevice->insertRow(rowCount);
- ui->tableWidgetDevice->setItem(row, 1, new QTableWidgetItem(QString::number(row+1)));
- ui->tableWidgetDevice->setItem(row, 2, new QTableWidgetItem(device.equipment_name)); //设置数据
- ui->tableWidgetDevice->setItem(row, 3, new QTableWidgetItem(device.model)); //设置数据
- ui->tableWidgetDevice->setItem(row, 4, new QTableWidgetItem(device.help_instruction)); //设置数据
- ui->tableWidgetDevice->setItem(row, 5, new QTableWidgetItem(device.manufacture_no)); //设置数据
- ui->tableWidgetDevice->setItem(row, 6, new QTableWidgetItem(device.manufacturer)); //设置数据
- ui->tableWidgetDevice->setItem(row, 7, new QTableWidgetItem(device.meter_identify)); //设置数据
- //QDebug
- row++;
+ for (const MyTask& myTask : data) {
+ rowCount = ui->tableWidgetDevice->rowCount();
+ ui->tableWidgetDevice->insertRow(rowCount);
+ QTableWidgetItem* p_check = new QTableWidgetItem();
+ p_check->setCheckState(Qt::Unchecked); //设置首列为 CheckBox 控件
+ ui->tableWidgetDevice->setItem(row,0,p_check);
+
+ ui->tableWidgetDevice->setItem(row, 1, new QTableWidgetItem(QString::number(row+1)));
+ //ui->tableWidget->setItem(row, 0, new QTableWidgetItem(dept.id));
+ ui->tableWidgetDevice->setItem(row, 2, new QTableWidgetItem(myTask.sample_name)); //设置数据
+ ui->tableWidgetDevice->setItem(row, 3, new QTableWidgetItem(myTask.sample_model)); //设置数据
+ ui->tableWidgetDevice->setItem(row, 4, new QTableWidgetItem(myTask.help_instruction)); //设置数据
+ ui->tableWidgetDevice->setItem(row, 5, new QTableWidgetItem(myTask.manufacture_no)); //设置数据
+ ui->tableWidgetDevice->setItem(row, 6, new QTableWidgetItem(myTask.manufacturer)); //设置数据
+ ui->tableWidgetDevice->setItem(row, 7, new QTableWidgetItem(myTask.customer_name)); //设置数据
+ row++;
}
}
diff --git a/softwareDirectory/AutoVerScheme/newverifymethod.cpp b/softwareDirectory/AutoVerScheme/newverifymethod.cpp
index 8bab5f3..e07a035 100644
--- a/softwareDirectory/AutoVerScheme/newverifymethod.cpp
+++ b/softwareDirectory/AutoVerScheme/newverifymethod.cpp
@@ -1,5 +1,6 @@
#include "newverifymethod.h"
#include "ui_newverifymethod.h"
+#include "verifydevice.h"
NewVerifyMethod::NewVerifyMethod(QWidget *parent) :
QWidget(parent),
@@ -12,3 +13,11 @@
{
delete ui;
}
+
+void NewVerifyMethod::showVerifyDevice()
+{
+ VerifyDevice *checkWindow = new VerifyDevice;
+ checkWindow->setWindowState(Qt::WindowMaximized);
+ checkWindow->setWindowModality(Qt::ApplicationModal);
+ checkWindow->show();
+}
diff --git a/softwareDirectory/AutoVerScheme/AutoVerScheme.pro b/softwareDirectory/AutoVerScheme/AutoVerScheme.pro
index 122d6ca..5bd9a15 100644
--- a/softwareDirectory/AutoVerScheme/AutoVerScheme.pro
+++ b/softwareDirectory/AutoVerScheme/AutoVerScheme.pro
@@ -49,6 +49,7 @@
standard_deviceitem.cpp \
testdataitem.cpp \
testview.cpp \
+ verifydevice.cpp \
verifymethodmanage.cpp \
verifywindow.cpp \
visacommonengine.cpp \
@@ -88,6 +89,7 @@
standard_deviceitem.h \
testdataitem.h \
testview.h \
+ verifydevice.h \
verifymethodmanage.h \
verifywindow.h\
biz_device_manage_serve.h \
@@ -114,6 +116,7 @@
standard_deviceitem.ui \
testdataitem.ui \
testview.ui \
+ verifydevice.ui \
verifymethodmanage.ui \
verifywindow.ui
diff --git a/softwareDirectory/AutoVerScheme/AutoVerScheme.pro.user b/softwareDirectory/AutoVerScheme/AutoVerScheme.pro.user
index 76c04be..39bcba0 100644
--- a/softwareDirectory/AutoVerScheme/AutoVerScheme.pro.user
+++ b/softwareDirectory/AutoVerScheme/AutoVerScheme.pro.user
@@ -1,6 +1,6 @@
-
+
EnvironmentId
@@ -574,6 +574,6 @@
Version
- 22
+ 22
diff --git a/softwareDirectory/AutoVerScheme/checkwindow.cpp b/softwareDirectory/AutoVerScheme/checkwindow.cpp
index 9b97f91..25134ba 100644
--- a/softwareDirectory/AutoVerScheme/checkwindow.cpp
+++ b/softwareDirectory/AutoVerScheme/checkwindow.cpp
@@ -2,6 +2,7 @@
#include "ui_checkwindow.h"
#include "dialogcheckresult.h"
#include
+#include "my_tasks_serve.h"
#include "basecommonapi.h"
CheckWindow::CheckWindow(QWidget *parent) :
@@ -57,23 +58,31 @@
void CheckWindow::getCheckDevice()
{
- QList data = BaseCommonApi::getTestedDevice();
+ MyTasks dbManager;
+ // 调用数据库管理器的函数获取数据
+ //模拟用户ID
+ QString userId="1640229293790650370";
+ QList data = dbManager.getMyTasks(userId);
int rowCount = 0;
int row=0;
QString State;
- for (const TestedDevice& device : data) {
- rowCount = ui->tableWidgetDevice->rowCount();
- ui->tableWidgetDevice->insertRow(rowCount);
- ui->tableWidgetDevice->setItem(row, 1, new QTableWidgetItem(QString::number(row+1)));
- ui->tableWidgetDevice->setItem(row, 2, new QTableWidgetItem(device.equipment_name)); //设置数据
- ui->tableWidgetDevice->setItem(row, 3, new QTableWidgetItem(device.model)); //设置数据
- ui->tableWidgetDevice->setItem(row, 4, new QTableWidgetItem(device.help_instruction)); //设置数据
- ui->tableWidgetDevice->setItem(row, 5, new QTableWidgetItem(device.manufacture_no)); //设置数据
- ui->tableWidgetDevice->setItem(row, 6, new QTableWidgetItem(device.manufacturer)); //设置数据
- ui->tableWidgetDevice->setItem(row, 7, new QTableWidgetItem(device.meter_identify)); //设置数据
- //QDebug
- row++;
+ for (const MyTask& myTask : data) {
+ rowCount = ui->tableWidgetDevice->rowCount();
+ ui->tableWidgetDevice->insertRow(rowCount);
+ QTableWidgetItem* p_check = new QTableWidgetItem();
+ p_check->setCheckState(Qt::Unchecked); //设置首列为 CheckBox 控件
+ ui->tableWidgetDevice->setItem(row,0,p_check);
+
+ ui->tableWidgetDevice->setItem(row, 1, new QTableWidgetItem(QString::number(row+1)));
+ //ui->tableWidget->setItem(row, 0, new QTableWidgetItem(dept.id));
+ ui->tableWidgetDevice->setItem(row, 2, new QTableWidgetItem(myTask.sample_name)); //设置数据
+ ui->tableWidgetDevice->setItem(row, 3, new QTableWidgetItem(myTask.sample_model)); //设置数据
+ ui->tableWidgetDevice->setItem(row, 4, new QTableWidgetItem(myTask.help_instruction)); //设置数据
+ ui->tableWidgetDevice->setItem(row, 5, new QTableWidgetItem(myTask.manufacture_no)); //设置数据
+ ui->tableWidgetDevice->setItem(row, 6, new QTableWidgetItem(myTask.manufacturer)); //设置数据
+ ui->tableWidgetDevice->setItem(row, 7, new QTableWidgetItem(myTask.customer_name)); //设置数据
+ row++;
}
}
diff --git a/softwareDirectory/AutoVerScheme/newverifymethod.cpp b/softwareDirectory/AutoVerScheme/newverifymethod.cpp
index 8bab5f3..e07a035 100644
--- a/softwareDirectory/AutoVerScheme/newverifymethod.cpp
+++ b/softwareDirectory/AutoVerScheme/newverifymethod.cpp
@@ -1,5 +1,6 @@
#include "newverifymethod.h"
#include "ui_newverifymethod.h"
+#include "verifydevice.h"
NewVerifyMethod::NewVerifyMethod(QWidget *parent) :
QWidget(parent),
@@ -12,3 +13,11 @@
{
delete ui;
}
+
+void NewVerifyMethod::showVerifyDevice()
+{
+ VerifyDevice *checkWindow = new VerifyDevice;
+ checkWindow->setWindowState(Qt::WindowMaximized);
+ checkWindow->setWindowModality(Qt::ApplicationModal);
+ checkWindow->show();
+}
diff --git a/softwareDirectory/AutoVerScheme/newverifymethod.h b/softwareDirectory/AutoVerScheme/newverifymethod.h
index e17b625..46caeb4 100644
--- a/softwareDirectory/AutoVerScheme/newverifymethod.h
+++ b/softwareDirectory/AutoVerScheme/newverifymethod.h
@@ -14,7 +14,8 @@
public:
explicit NewVerifyMethod(QWidget *parent = nullptr);
~NewVerifyMethod();
-
+private slots:
+ void showVerifyDevice();
private:
Ui::NewVerifyMethod *ui;
};
diff --git a/softwareDirectory/AutoVerScheme/AutoVerScheme.pro b/softwareDirectory/AutoVerScheme/AutoVerScheme.pro
index 122d6ca..5bd9a15 100644
--- a/softwareDirectory/AutoVerScheme/AutoVerScheme.pro
+++ b/softwareDirectory/AutoVerScheme/AutoVerScheme.pro
@@ -49,6 +49,7 @@
standard_deviceitem.cpp \
testdataitem.cpp \
testview.cpp \
+ verifydevice.cpp \
verifymethodmanage.cpp \
verifywindow.cpp \
visacommonengine.cpp \
@@ -88,6 +89,7 @@
standard_deviceitem.h \
testdataitem.h \
testview.h \
+ verifydevice.h \
verifymethodmanage.h \
verifywindow.h\
biz_device_manage_serve.h \
@@ -114,6 +116,7 @@
standard_deviceitem.ui \
testdataitem.ui \
testview.ui \
+ verifydevice.ui \
verifymethodmanage.ui \
verifywindow.ui
diff --git a/softwareDirectory/AutoVerScheme/AutoVerScheme.pro.user b/softwareDirectory/AutoVerScheme/AutoVerScheme.pro.user
index 76c04be..39bcba0 100644
--- a/softwareDirectory/AutoVerScheme/AutoVerScheme.pro.user
+++ b/softwareDirectory/AutoVerScheme/AutoVerScheme.pro.user
@@ -1,6 +1,6 @@
-
+
EnvironmentId
@@ -574,6 +574,6 @@
Version
- 22
+ 22
diff --git a/softwareDirectory/AutoVerScheme/checkwindow.cpp b/softwareDirectory/AutoVerScheme/checkwindow.cpp
index 9b97f91..25134ba 100644
--- a/softwareDirectory/AutoVerScheme/checkwindow.cpp
+++ b/softwareDirectory/AutoVerScheme/checkwindow.cpp
@@ -2,6 +2,7 @@
#include "ui_checkwindow.h"
#include "dialogcheckresult.h"
#include
+#include "my_tasks_serve.h"
#include "basecommonapi.h"
CheckWindow::CheckWindow(QWidget *parent) :
@@ -57,23 +58,31 @@
void CheckWindow::getCheckDevice()
{
- QList data = BaseCommonApi::getTestedDevice();
+ MyTasks dbManager;
+ // 调用数据库管理器的函数获取数据
+ //模拟用户ID
+ QString userId="1640229293790650370";
+ QList data = dbManager.getMyTasks(userId);
int rowCount = 0;
int row=0;
QString State;
- for (const TestedDevice& device : data) {
- rowCount = ui->tableWidgetDevice->rowCount();
- ui->tableWidgetDevice->insertRow(rowCount);
- ui->tableWidgetDevice->setItem(row, 1, new QTableWidgetItem(QString::number(row+1)));
- ui->tableWidgetDevice->setItem(row, 2, new QTableWidgetItem(device.equipment_name)); //设置数据
- ui->tableWidgetDevice->setItem(row, 3, new QTableWidgetItem(device.model)); //设置数据
- ui->tableWidgetDevice->setItem(row, 4, new QTableWidgetItem(device.help_instruction)); //设置数据
- ui->tableWidgetDevice->setItem(row, 5, new QTableWidgetItem(device.manufacture_no)); //设置数据
- ui->tableWidgetDevice->setItem(row, 6, new QTableWidgetItem(device.manufacturer)); //设置数据
- ui->tableWidgetDevice->setItem(row, 7, new QTableWidgetItem(device.meter_identify)); //设置数据
- //QDebug
- row++;
+ for (const MyTask& myTask : data) {
+ rowCount = ui->tableWidgetDevice->rowCount();
+ ui->tableWidgetDevice->insertRow(rowCount);
+ QTableWidgetItem* p_check = new QTableWidgetItem();
+ p_check->setCheckState(Qt::Unchecked); //设置首列为 CheckBox 控件
+ ui->tableWidgetDevice->setItem(row,0,p_check);
+
+ ui->tableWidgetDevice->setItem(row, 1, new QTableWidgetItem(QString::number(row+1)));
+ //ui->tableWidget->setItem(row, 0, new QTableWidgetItem(dept.id));
+ ui->tableWidgetDevice->setItem(row, 2, new QTableWidgetItem(myTask.sample_name)); //设置数据
+ ui->tableWidgetDevice->setItem(row, 3, new QTableWidgetItem(myTask.sample_model)); //设置数据
+ ui->tableWidgetDevice->setItem(row, 4, new QTableWidgetItem(myTask.help_instruction)); //设置数据
+ ui->tableWidgetDevice->setItem(row, 5, new QTableWidgetItem(myTask.manufacture_no)); //设置数据
+ ui->tableWidgetDevice->setItem(row, 6, new QTableWidgetItem(myTask.manufacturer)); //设置数据
+ ui->tableWidgetDevice->setItem(row, 7, new QTableWidgetItem(myTask.customer_name)); //设置数据
+ row++;
}
}
diff --git a/softwareDirectory/AutoVerScheme/newverifymethod.cpp b/softwareDirectory/AutoVerScheme/newverifymethod.cpp
index 8bab5f3..e07a035 100644
--- a/softwareDirectory/AutoVerScheme/newverifymethod.cpp
+++ b/softwareDirectory/AutoVerScheme/newverifymethod.cpp
@@ -1,5 +1,6 @@
#include "newverifymethod.h"
#include "ui_newverifymethod.h"
+#include "verifydevice.h"
NewVerifyMethod::NewVerifyMethod(QWidget *parent) :
QWidget(parent),
@@ -12,3 +13,11 @@
{
delete ui;
}
+
+void NewVerifyMethod::showVerifyDevice()
+{
+ VerifyDevice *checkWindow = new VerifyDevice;
+ checkWindow->setWindowState(Qt::WindowMaximized);
+ checkWindow->setWindowModality(Qt::ApplicationModal);
+ checkWindow->show();
+}
diff --git a/softwareDirectory/AutoVerScheme/newverifymethod.h b/softwareDirectory/AutoVerScheme/newverifymethod.h
index e17b625..46caeb4 100644
--- a/softwareDirectory/AutoVerScheme/newverifymethod.h
+++ b/softwareDirectory/AutoVerScheme/newverifymethod.h
@@ -14,7 +14,8 @@
public:
explicit NewVerifyMethod(QWidget *parent = nullptr);
~NewVerifyMethod();
-
+private slots:
+ void showVerifyDevice();
private:
Ui::NewVerifyMethod *ui;
};
diff --git a/softwareDirectory/AutoVerScheme/newverifymethod.ui b/softwareDirectory/AutoVerScheme/newverifymethod.ui
index c769a80..9fa8239 100644
--- a/softwareDirectory/AutoVerScheme/newverifymethod.ui
+++ b/softwareDirectory/AutoVerScheme/newverifymethod.ui
@@ -420,5 +420,25 @@
-
+
+
+ pushButton_13
+ clicked()
+ NewVerifyMethod
+ showVerifyDevice()
+
+
+ 1287
+ 188
+
+
+ 1340
+ 185
+
+
+
+
+
+ showVerifyDevice()
+
diff --git a/softwareDirectory/AutoVerScheme/AutoVerScheme.pro b/softwareDirectory/AutoVerScheme/AutoVerScheme.pro
index 122d6ca..5bd9a15 100644
--- a/softwareDirectory/AutoVerScheme/AutoVerScheme.pro
+++ b/softwareDirectory/AutoVerScheme/AutoVerScheme.pro
@@ -49,6 +49,7 @@
standard_deviceitem.cpp \
testdataitem.cpp \
testview.cpp \
+ verifydevice.cpp \
verifymethodmanage.cpp \
verifywindow.cpp \
visacommonengine.cpp \
@@ -88,6 +89,7 @@
standard_deviceitem.h \
testdataitem.h \
testview.h \
+ verifydevice.h \
verifymethodmanage.h \
verifywindow.h\
biz_device_manage_serve.h \
@@ -114,6 +116,7 @@
standard_deviceitem.ui \
testdataitem.ui \
testview.ui \
+ verifydevice.ui \
verifymethodmanage.ui \
verifywindow.ui
diff --git a/softwareDirectory/AutoVerScheme/AutoVerScheme.pro.user b/softwareDirectory/AutoVerScheme/AutoVerScheme.pro.user
index 76c04be..39bcba0 100644
--- a/softwareDirectory/AutoVerScheme/AutoVerScheme.pro.user
+++ b/softwareDirectory/AutoVerScheme/AutoVerScheme.pro.user
@@ -1,6 +1,6 @@
-
+
EnvironmentId
@@ -574,6 +574,6 @@
Version
- 22
+ 22
diff --git a/softwareDirectory/AutoVerScheme/checkwindow.cpp b/softwareDirectory/AutoVerScheme/checkwindow.cpp
index 9b97f91..25134ba 100644
--- a/softwareDirectory/AutoVerScheme/checkwindow.cpp
+++ b/softwareDirectory/AutoVerScheme/checkwindow.cpp
@@ -2,6 +2,7 @@
#include "ui_checkwindow.h"
#include "dialogcheckresult.h"
#include
+#include "my_tasks_serve.h"
#include "basecommonapi.h"
CheckWindow::CheckWindow(QWidget *parent) :
@@ -57,23 +58,31 @@
void CheckWindow::getCheckDevice()
{
- QList data = BaseCommonApi::getTestedDevice();
+ MyTasks dbManager;
+ // 调用数据库管理器的函数获取数据
+ //模拟用户ID
+ QString userId="1640229293790650370";
+ QList data = dbManager.getMyTasks(userId);
int rowCount = 0;
int row=0;
QString State;
- for (const TestedDevice& device : data) {
- rowCount = ui->tableWidgetDevice->rowCount();
- ui->tableWidgetDevice->insertRow(rowCount);
- ui->tableWidgetDevice->setItem(row, 1, new QTableWidgetItem(QString::number(row+1)));
- ui->tableWidgetDevice->setItem(row, 2, new QTableWidgetItem(device.equipment_name)); //设置数据
- ui->tableWidgetDevice->setItem(row, 3, new QTableWidgetItem(device.model)); //设置数据
- ui->tableWidgetDevice->setItem(row, 4, new QTableWidgetItem(device.help_instruction)); //设置数据
- ui->tableWidgetDevice->setItem(row, 5, new QTableWidgetItem(device.manufacture_no)); //设置数据
- ui->tableWidgetDevice->setItem(row, 6, new QTableWidgetItem(device.manufacturer)); //设置数据
- ui->tableWidgetDevice->setItem(row, 7, new QTableWidgetItem(device.meter_identify)); //设置数据
- //QDebug
- row++;
+ for (const MyTask& myTask : data) {
+ rowCount = ui->tableWidgetDevice->rowCount();
+ ui->tableWidgetDevice->insertRow(rowCount);
+ QTableWidgetItem* p_check = new QTableWidgetItem();
+ p_check->setCheckState(Qt::Unchecked); //设置首列为 CheckBox 控件
+ ui->tableWidgetDevice->setItem(row,0,p_check);
+
+ ui->tableWidgetDevice->setItem(row, 1, new QTableWidgetItem(QString::number(row+1)));
+ //ui->tableWidget->setItem(row, 0, new QTableWidgetItem(dept.id));
+ ui->tableWidgetDevice->setItem(row, 2, new QTableWidgetItem(myTask.sample_name)); //设置数据
+ ui->tableWidgetDevice->setItem(row, 3, new QTableWidgetItem(myTask.sample_model)); //设置数据
+ ui->tableWidgetDevice->setItem(row, 4, new QTableWidgetItem(myTask.help_instruction)); //设置数据
+ ui->tableWidgetDevice->setItem(row, 5, new QTableWidgetItem(myTask.manufacture_no)); //设置数据
+ ui->tableWidgetDevice->setItem(row, 6, new QTableWidgetItem(myTask.manufacturer)); //设置数据
+ ui->tableWidgetDevice->setItem(row, 7, new QTableWidgetItem(myTask.customer_name)); //设置数据
+ row++;
}
}
diff --git a/softwareDirectory/AutoVerScheme/newverifymethod.cpp b/softwareDirectory/AutoVerScheme/newverifymethod.cpp
index 8bab5f3..e07a035 100644
--- a/softwareDirectory/AutoVerScheme/newverifymethod.cpp
+++ b/softwareDirectory/AutoVerScheme/newverifymethod.cpp
@@ -1,5 +1,6 @@
#include "newverifymethod.h"
#include "ui_newverifymethod.h"
+#include "verifydevice.h"
NewVerifyMethod::NewVerifyMethod(QWidget *parent) :
QWidget(parent),
@@ -12,3 +13,11 @@
{
delete ui;
}
+
+void NewVerifyMethod::showVerifyDevice()
+{
+ VerifyDevice *checkWindow = new VerifyDevice;
+ checkWindow->setWindowState(Qt::WindowMaximized);
+ checkWindow->setWindowModality(Qt::ApplicationModal);
+ checkWindow->show();
+}
diff --git a/softwareDirectory/AutoVerScheme/newverifymethod.h b/softwareDirectory/AutoVerScheme/newverifymethod.h
index e17b625..46caeb4 100644
--- a/softwareDirectory/AutoVerScheme/newverifymethod.h
+++ b/softwareDirectory/AutoVerScheme/newverifymethod.h
@@ -14,7 +14,8 @@
public:
explicit NewVerifyMethod(QWidget *parent = nullptr);
~NewVerifyMethod();
-
+private slots:
+ void showVerifyDevice();
private:
Ui::NewVerifyMethod *ui;
};
diff --git a/softwareDirectory/AutoVerScheme/newverifymethod.ui b/softwareDirectory/AutoVerScheme/newverifymethod.ui
index c769a80..9fa8239 100644
--- a/softwareDirectory/AutoVerScheme/newverifymethod.ui
+++ b/softwareDirectory/AutoVerScheme/newverifymethod.ui
@@ -420,5 +420,25 @@
-
+
+
+ pushButton_13
+ clicked()
+ NewVerifyMethod
+ showVerifyDevice()
+
+
+ 1287
+ 188
+
+
+ 1340
+ 185
+
+
+
+
+
+ showVerifyDevice()
+
diff --git a/softwareDirectory/AutoVerScheme/res/res.qrc b/softwareDirectory/AutoVerScheme/res/res.qrc
index dd03a94..80e79c1 100644
--- a/softwareDirectory/AutoVerScheme/res/res.qrc
+++ b/softwareDirectory/AutoVerScheme/res/res.qrc
@@ -43,5 +43,6 @@
image/Index/u7458.svg
image/Index/u7488.svg
image/Index/u7491.svg
+ image/Index/u7538.svg
diff --git a/softwareDirectory/AutoVerScheme/AutoVerScheme.pro b/softwareDirectory/AutoVerScheme/AutoVerScheme.pro
index 122d6ca..5bd9a15 100644
--- a/softwareDirectory/AutoVerScheme/AutoVerScheme.pro
+++ b/softwareDirectory/AutoVerScheme/AutoVerScheme.pro
@@ -49,6 +49,7 @@
standard_deviceitem.cpp \
testdataitem.cpp \
testview.cpp \
+ verifydevice.cpp \
verifymethodmanage.cpp \
verifywindow.cpp \
visacommonengine.cpp \
@@ -88,6 +89,7 @@
standard_deviceitem.h \
testdataitem.h \
testview.h \
+ verifydevice.h \
verifymethodmanage.h \
verifywindow.h\
biz_device_manage_serve.h \
@@ -114,6 +116,7 @@
standard_deviceitem.ui \
testdataitem.ui \
testview.ui \
+ verifydevice.ui \
verifymethodmanage.ui \
verifywindow.ui
diff --git a/softwareDirectory/AutoVerScheme/AutoVerScheme.pro.user b/softwareDirectory/AutoVerScheme/AutoVerScheme.pro.user
index 76c04be..39bcba0 100644
--- a/softwareDirectory/AutoVerScheme/AutoVerScheme.pro.user
+++ b/softwareDirectory/AutoVerScheme/AutoVerScheme.pro.user
@@ -1,6 +1,6 @@
-
+
EnvironmentId
@@ -574,6 +574,6 @@
Version
- 22
+ 22
diff --git a/softwareDirectory/AutoVerScheme/checkwindow.cpp b/softwareDirectory/AutoVerScheme/checkwindow.cpp
index 9b97f91..25134ba 100644
--- a/softwareDirectory/AutoVerScheme/checkwindow.cpp
+++ b/softwareDirectory/AutoVerScheme/checkwindow.cpp
@@ -2,6 +2,7 @@
#include "ui_checkwindow.h"
#include "dialogcheckresult.h"
#include
+#include "my_tasks_serve.h"
#include "basecommonapi.h"
CheckWindow::CheckWindow(QWidget *parent) :
@@ -57,23 +58,31 @@
void CheckWindow::getCheckDevice()
{
- QList data = BaseCommonApi::getTestedDevice();
+ MyTasks dbManager;
+ // 调用数据库管理器的函数获取数据
+ //模拟用户ID
+ QString userId="1640229293790650370";
+ QList data = dbManager.getMyTasks(userId);
int rowCount = 0;
int row=0;
QString State;
- for (const TestedDevice& device : data) {
- rowCount = ui->tableWidgetDevice->rowCount();
- ui->tableWidgetDevice->insertRow(rowCount);
- ui->tableWidgetDevice->setItem(row, 1, new QTableWidgetItem(QString::number(row+1)));
- ui->tableWidgetDevice->setItem(row, 2, new QTableWidgetItem(device.equipment_name)); //设置数据
- ui->tableWidgetDevice->setItem(row, 3, new QTableWidgetItem(device.model)); //设置数据
- ui->tableWidgetDevice->setItem(row, 4, new QTableWidgetItem(device.help_instruction)); //设置数据
- ui->tableWidgetDevice->setItem(row, 5, new QTableWidgetItem(device.manufacture_no)); //设置数据
- ui->tableWidgetDevice->setItem(row, 6, new QTableWidgetItem(device.manufacturer)); //设置数据
- ui->tableWidgetDevice->setItem(row, 7, new QTableWidgetItem(device.meter_identify)); //设置数据
- //QDebug
- row++;
+ for (const MyTask& myTask : data) {
+ rowCount = ui->tableWidgetDevice->rowCount();
+ ui->tableWidgetDevice->insertRow(rowCount);
+ QTableWidgetItem* p_check = new QTableWidgetItem();
+ p_check->setCheckState(Qt::Unchecked); //设置首列为 CheckBox 控件
+ ui->tableWidgetDevice->setItem(row,0,p_check);
+
+ ui->tableWidgetDevice->setItem(row, 1, new QTableWidgetItem(QString::number(row+1)));
+ //ui->tableWidget->setItem(row, 0, new QTableWidgetItem(dept.id));
+ ui->tableWidgetDevice->setItem(row, 2, new QTableWidgetItem(myTask.sample_name)); //设置数据
+ ui->tableWidgetDevice->setItem(row, 3, new QTableWidgetItem(myTask.sample_model)); //设置数据
+ ui->tableWidgetDevice->setItem(row, 4, new QTableWidgetItem(myTask.help_instruction)); //设置数据
+ ui->tableWidgetDevice->setItem(row, 5, new QTableWidgetItem(myTask.manufacture_no)); //设置数据
+ ui->tableWidgetDevice->setItem(row, 6, new QTableWidgetItem(myTask.manufacturer)); //设置数据
+ ui->tableWidgetDevice->setItem(row, 7, new QTableWidgetItem(myTask.customer_name)); //设置数据
+ row++;
}
}
diff --git a/softwareDirectory/AutoVerScheme/newverifymethod.cpp b/softwareDirectory/AutoVerScheme/newverifymethod.cpp
index 8bab5f3..e07a035 100644
--- a/softwareDirectory/AutoVerScheme/newverifymethod.cpp
+++ b/softwareDirectory/AutoVerScheme/newverifymethod.cpp
@@ -1,5 +1,6 @@
#include "newverifymethod.h"
#include "ui_newverifymethod.h"
+#include "verifydevice.h"
NewVerifyMethod::NewVerifyMethod(QWidget *parent) :
QWidget(parent),
@@ -12,3 +13,11 @@
{
delete ui;
}
+
+void NewVerifyMethod::showVerifyDevice()
+{
+ VerifyDevice *checkWindow = new VerifyDevice;
+ checkWindow->setWindowState(Qt::WindowMaximized);
+ checkWindow->setWindowModality(Qt::ApplicationModal);
+ checkWindow->show();
+}
diff --git a/softwareDirectory/AutoVerScheme/newverifymethod.h b/softwareDirectory/AutoVerScheme/newverifymethod.h
index e17b625..46caeb4 100644
--- a/softwareDirectory/AutoVerScheme/newverifymethod.h
+++ b/softwareDirectory/AutoVerScheme/newverifymethod.h
@@ -14,7 +14,8 @@
public:
explicit NewVerifyMethod(QWidget *parent = nullptr);
~NewVerifyMethod();
-
+private slots:
+ void showVerifyDevice();
private:
Ui::NewVerifyMethod *ui;
};
diff --git a/softwareDirectory/AutoVerScheme/newverifymethod.ui b/softwareDirectory/AutoVerScheme/newverifymethod.ui
index c769a80..9fa8239 100644
--- a/softwareDirectory/AutoVerScheme/newverifymethod.ui
+++ b/softwareDirectory/AutoVerScheme/newverifymethod.ui
@@ -420,5 +420,25 @@
-
+
+
+ pushButton_13
+ clicked()
+ NewVerifyMethod
+ showVerifyDevice()
+
+
+ 1287
+ 188
+
+
+ 1340
+ 185
+
+
+
+
+
+ showVerifyDevice()
+
diff --git a/softwareDirectory/AutoVerScheme/res/res.qrc b/softwareDirectory/AutoVerScheme/res/res.qrc
index dd03a94..80e79c1 100644
--- a/softwareDirectory/AutoVerScheme/res/res.qrc
+++ b/softwareDirectory/AutoVerScheme/res/res.qrc
@@ -43,5 +43,6 @@
image/Index/u7458.svg
image/Index/u7488.svg
image/Index/u7491.svg
+ image/Index/u7538.svg
diff --git a/softwareDirectory/AutoVerScheme/standard_deviceitem.ui b/softwareDirectory/AutoVerScheme/standard_deviceitem.ui
index 86486ca..4416771 100644
--- a/softwareDirectory/AutoVerScheme/standard_deviceitem.ui
+++ b/softwareDirectory/AutoVerScheme/standard_deviceitem.ui
@@ -830,7 +830,7 @@
XXX
- 2
+ 3
false
diff --git a/softwareDirectory/AutoVerScheme/AutoVerScheme.pro b/softwareDirectory/AutoVerScheme/AutoVerScheme.pro
index 122d6ca..5bd9a15 100644
--- a/softwareDirectory/AutoVerScheme/AutoVerScheme.pro
+++ b/softwareDirectory/AutoVerScheme/AutoVerScheme.pro
@@ -49,6 +49,7 @@
standard_deviceitem.cpp \
testdataitem.cpp \
testview.cpp \
+ verifydevice.cpp \
verifymethodmanage.cpp \
verifywindow.cpp \
visacommonengine.cpp \
@@ -88,6 +89,7 @@
standard_deviceitem.h \
testdataitem.h \
testview.h \
+ verifydevice.h \
verifymethodmanage.h \
verifywindow.h\
biz_device_manage_serve.h \
@@ -114,6 +116,7 @@
standard_deviceitem.ui \
testdataitem.ui \
testview.ui \
+ verifydevice.ui \
verifymethodmanage.ui \
verifywindow.ui
diff --git a/softwareDirectory/AutoVerScheme/AutoVerScheme.pro.user b/softwareDirectory/AutoVerScheme/AutoVerScheme.pro.user
index 76c04be..39bcba0 100644
--- a/softwareDirectory/AutoVerScheme/AutoVerScheme.pro.user
+++ b/softwareDirectory/AutoVerScheme/AutoVerScheme.pro.user
@@ -1,6 +1,6 @@
-
+
EnvironmentId
@@ -574,6 +574,6 @@
Version
- 22
+ 22
diff --git a/softwareDirectory/AutoVerScheme/checkwindow.cpp b/softwareDirectory/AutoVerScheme/checkwindow.cpp
index 9b97f91..25134ba 100644
--- a/softwareDirectory/AutoVerScheme/checkwindow.cpp
+++ b/softwareDirectory/AutoVerScheme/checkwindow.cpp
@@ -2,6 +2,7 @@
#include "ui_checkwindow.h"
#include "dialogcheckresult.h"
#include
+#include "my_tasks_serve.h"
#include "basecommonapi.h"
CheckWindow::CheckWindow(QWidget *parent) :
@@ -57,23 +58,31 @@
void CheckWindow::getCheckDevice()
{
- QList data = BaseCommonApi::getTestedDevice();
+ MyTasks dbManager;
+ // 调用数据库管理器的函数获取数据
+ //模拟用户ID
+ QString userId="1640229293790650370";
+ QList data = dbManager.getMyTasks(userId);
int rowCount = 0;
int row=0;
QString State;
- for (const TestedDevice& device : data) {
- rowCount = ui->tableWidgetDevice->rowCount();
- ui->tableWidgetDevice->insertRow(rowCount);
- ui->tableWidgetDevice->setItem(row, 1, new QTableWidgetItem(QString::number(row+1)));
- ui->tableWidgetDevice->setItem(row, 2, new QTableWidgetItem(device.equipment_name)); //设置数据
- ui->tableWidgetDevice->setItem(row, 3, new QTableWidgetItem(device.model)); //设置数据
- ui->tableWidgetDevice->setItem(row, 4, new QTableWidgetItem(device.help_instruction)); //设置数据
- ui->tableWidgetDevice->setItem(row, 5, new QTableWidgetItem(device.manufacture_no)); //设置数据
- ui->tableWidgetDevice->setItem(row, 6, new QTableWidgetItem(device.manufacturer)); //设置数据
- ui->tableWidgetDevice->setItem(row, 7, new QTableWidgetItem(device.meter_identify)); //设置数据
- //QDebug
- row++;
+ for (const MyTask& myTask : data) {
+ rowCount = ui->tableWidgetDevice->rowCount();
+ ui->tableWidgetDevice->insertRow(rowCount);
+ QTableWidgetItem* p_check = new QTableWidgetItem();
+ p_check->setCheckState(Qt::Unchecked); //设置首列为 CheckBox 控件
+ ui->tableWidgetDevice->setItem(row,0,p_check);
+
+ ui->tableWidgetDevice->setItem(row, 1, new QTableWidgetItem(QString::number(row+1)));
+ //ui->tableWidget->setItem(row, 0, new QTableWidgetItem(dept.id));
+ ui->tableWidgetDevice->setItem(row, 2, new QTableWidgetItem(myTask.sample_name)); //设置数据
+ ui->tableWidgetDevice->setItem(row, 3, new QTableWidgetItem(myTask.sample_model)); //设置数据
+ ui->tableWidgetDevice->setItem(row, 4, new QTableWidgetItem(myTask.help_instruction)); //设置数据
+ ui->tableWidgetDevice->setItem(row, 5, new QTableWidgetItem(myTask.manufacture_no)); //设置数据
+ ui->tableWidgetDevice->setItem(row, 6, new QTableWidgetItem(myTask.manufacturer)); //设置数据
+ ui->tableWidgetDevice->setItem(row, 7, new QTableWidgetItem(myTask.customer_name)); //设置数据
+ row++;
}
}
diff --git a/softwareDirectory/AutoVerScheme/newverifymethod.cpp b/softwareDirectory/AutoVerScheme/newverifymethod.cpp
index 8bab5f3..e07a035 100644
--- a/softwareDirectory/AutoVerScheme/newverifymethod.cpp
+++ b/softwareDirectory/AutoVerScheme/newverifymethod.cpp
@@ -1,5 +1,6 @@
#include "newverifymethod.h"
#include "ui_newverifymethod.h"
+#include "verifydevice.h"
NewVerifyMethod::NewVerifyMethod(QWidget *parent) :
QWidget(parent),
@@ -12,3 +13,11 @@
{
delete ui;
}
+
+void NewVerifyMethod::showVerifyDevice()
+{
+ VerifyDevice *checkWindow = new VerifyDevice;
+ checkWindow->setWindowState(Qt::WindowMaximized);
+ checkWindow->setWindowModality(Qt::ApplicationModal);
+ checkWindow->show();
+}
diff --git a/softwareDirectory/AutoVerScheme/newverifymethod.h b/softwareDirectory/AutoVerScheme/newverifymethod.h
index e17b625..46caeb4 100644
--- a/softwareDirectory/AutoVerScheme/newverifymethod.h
+++ b/softwareDirectory/AutoVerScheme/newverifymethod.h
@@ -14,7 +14,8 @@
public:
explicit NewVerifyMethod(QWidget *parent = nullptr);
~NewVerifyMethod();
-
+private slots:
+ void showVerifyDevice();
private:
Ui::NewVerifyMethod *ui;
};
diff --git a/softwareDirectory/AutoVerScheme/newverifymethod.ui b/softwareDirectory/AutoVerScheme/newverifymethod.ui
index c769a80..9fa8239 100644
--- a/softwareDirectory/AutoVerScheme/newverifymethod.ui
+++ b/softwareDirectory/AutoVerScheme/newverifymethod.ui
@@ -420,5 +420,25 @@
-
+
+
+ pushButton_13
+ clicked()
+ NewVerifyMethod
+ showVerifyDevice()
+
+
+ 1287
+ 188
+
+
+ 1340
+ 185
+
+
+
+
+
+ showVerifyDevice()
+
diff --git a/softwareDirectory/AutoVerScheme/res/res.qrc b/softwareDirectory/AutoVerScheme/res/res.qrc
index dd03a94..80e79c1 100644
--- a/softwareDirectory/AutoVerScheme/res/res.qrc
+++ b/softwareDirectory/AutoVerScheme/res/res.qrc
@@ -43,5 +43,6 @@
image/Index/u7458.svg
image/Index/u7488.svg
image/Index/u7491.svg
+ image/Index/u7538.svg
diff --git a/softwareDirectory/AutoVerScheme/standard_deviceitem.ui b/softwareDirectory/AutoVerScheme/standard_deviceitem.ui
index 86486ca..4416771 100644
--- a/softwareDirectory/AutoVerScheme/standard_deviceitem.ui
+++ b/softwareDirectory/AutoVerScheme/standard_deviceitem.ui
@@ -830,7 +830,7 @@
XXX
- 2
+ 3
false
diff --git a/softwareDirectory/AutoVerScheme/verifydevice.cpp b/softwareDirectory/AutoVerScheme/verifydevice.cpp
index dc65644..e730e57 100644
--- a/softwareDirectory/AutoVerScheme/verifydevice.cpp
+++ b/softwareDirectory/AutoVerScheme/verifydevice.cpp
@@ -1,14 +1,65 @@
#include "verifydevice.h"
#include "ui_verifydevice.h"
+#include "biz_device_manage_serve.h"
+#include
VerifyDevice::VerifyDevice(QWidget *parent) :
QWidget(parent),
ui(new Ui::VerifyDevice)
{
ui->setupUi(this);
+ ui->tableWidget->setColumnWidth(0, 80);
+ for(int i=1;i<5;i++)
+ ui->tableWidget->horizontalHeader()->setSectionResizeMode(i,QHeaderView::Stretch);
+ ui->tableWidget_2->setColumnWidth(0, 80);
+ for(int i=1;i<5;i++)
+ ui->tableWidget_2->horizontalHeader()->setSectionResizeMode(i,QHeaderView::Stretch);
+ getVerifyDevice();
+ getCheckDevice();
}
VerifyDevice::~VerifyDevice()
{
delete ui;
}
+
+void VerifyDevice::getVerifyDevice()
+{
+ BizDeviceManage dbManager;
+ // 调用数据库管理器的函数获取数据
+ int rowCount=0;
+ int row=0;
+ QList data = dbManager.getBizDeviceManage();
+ for (const BizDevice& bizDevice : data) {
+ rowCount = ui->tableWidget->rowCount();
+ ui->tableWidget->insertRow(rowCount);
+ QCheckBox *checkBox = new QCheckBox;
+ ui->tableWidget->setCellWidget(row, 0, checkBox);
+ ui->tableWidget->setItem(row, 1, new QTableWidgetItem(bizDevice.equipment_name));
+ ui->tableWidget->setItem(row, 2, new QTableWidgetItem(bizDevice.model));
+ ui->tableWidget->setItem(row, 3, new QTableWidgetItem(bizDevice.manufacture_no));
+ ui->tableWidget->setItem(row, 4, new QTableWidgetItem(bizDevice.manufacturer));
+ row++;
+ }
+}
+
+void VerifyDevice::getCheckDevice()
+{
+ BizDeviceManage dbManager;
+ // 调用数据库管理器的函数获取数据
+ int rowCount=0;
+ int row=0;
+ QList data = dbManager.getBizDeviceManage();
+ for (const BizDevice& bizDevice : data) {
+ rowCount = ui->tableWidget_2->rowCount();
+ ui->tableWidget_2->insertRow(rowCount);
+ QCheckBox *checkBox = new QCheckBox;
+ ui->tableWidget_2->setCellWidget(row, 0, checkBox);
+ ui->tableWidget_2->setItem(row, 1, new QTableWidgetItem(bizDevice.equipment_name));
+ ui->tableWidget_2->setItem(row, 2, new QTableWidgetItem(bizDevice.model));
+ ui->tableWidget_2->setItem(row, 3, new QTableWidgetItem(bizDevice.manufacture_no));
+ ui->tableWidget_2->setItem(row, 4, new QTableWidgetItem(bizDevice.manufacturer));
+ row++;
+ }
+}
+
diff --git a/softwareDirectory/AutoVerScheme/AutoVerScheme.pro b/softwareDirectory/AutoVerScheme/AutoVerScheme.pro
index 122d6ca..5bd9a15 100644
--- a/softwareDirectory/AutoVerScheme/AutoVerScheme.pro
+++ b/softwareDirectory/AutoVerScheme/AutoVerScheme.pro
@@ -49,6 +49,7 @@
standard_deviceitem.cpp \
testdataitem.cpp \
testview.cpp \
+ verifydevice.cpp \
verifymethodmanage.cpp \
verifywindow.cpp \
visacommonengine.cpp \
@@ -88,6 +89,7 @@
standard_deviceitem.h \
testdataitem.h \
testview.h \
+ verifydevice.h \
verifymethodmanage.h \
verifywindow.h\
biz_device_manage_serve.h \
@@ -114,6 +116,7 @@
standard_deviceitem.ui \
testdataitem.ui \
testview.ui \
+ verifydevice.ui \
verifymethodmanage.ui \
verifywindow.ui
diff --git a/softwareDirectory/AutoVerScheme/AutoVerScheme.pro.user b/softwareDirectory/AutoVerScheme/AutoVerScheme.pro.user
index 76c04be..39bcba0 100644
--- a/softwareDirectory/AutoVerScheme/AutoVerScheme.pro.user
+++ b/softwareDirectory/AutoVerScheme/AutoVerScheme.pro.user
@@ -1,6 +1,6 @@
-
+
EnvironmentId
@@ -574,6 +574,6 @@
Version
- 22
+ 22
diff --git a/softwareDirectory/AutoVerScheme/checkwindow.cpp b/softwareDirectory/AutoVerScheme/checkwindow.cpp
index 9b97f91..25134ba 100644
--- a/softwareDirectory/AutoVerScheme/checkwindow.cpp
+++ b/softwareDirectory/AutoVerScheme/checkwindow.cpp
@@ -2,6 +2,7 @@
#include "ui_checkwindow.h"
#include "dialogcheckresult.h"
#include
+#include "my_tasks_serve.h"
#include "basecommonapi.h"
CheckWindow::CheckWindow(QWidget *parent) :
@@ -57,23 +58,31 @@
void CheckWindow::getCheckDevice()
{
- QList data = BaseCommonApi::getTestedDevice();
+ MyTasks dbManager;
+ // 调用数据库管理器的函数获取数据
+ //模拟用户ID
+ QString userId="1640229293790650370";
+ QList data = dbManager.getMyTasks(userId);
int rowCount = 0;
int row=0;
QString State;
- for (const TestedDevice& device : data) {
- rowCount = ui->tableWidgetDevice->rowCount();
- ui->tableWidgetDevice->insertRow(rowCount);
- ui->tableWidgetDevice->setItem(row, 1, new QTableWidgetItem(QString::number(row+1)));
- ui->tableWidgetDevice->setItem(row, 2, new QTableWidgetItem(device.equipment_name)); //设置数据
- ui->tableWidgetDevice->setItem(row, 3, new QTableWidgetItem(device.model)); //设置数据
- ui->tableWidgetDevice->setItem(row, 4, new QTableWidgetItem(device.help_instruction)); //设置数据
- ui->tableWidgetDevice->setItem(row, 5, new QTableWidgetItem(device.manufacture_no)); //设置数据
- ui->tableWidgetDevice->setItem(row, 6, new QTableWidgetItem(device.manufacturer)); //设置数据
- ui->tableWidgetDevice->setItem(row, 7, new QTableWidgetItem(device.meter_identify)); //设置数据
- //QDebug
- row++;
+ for (const MyTask& myTask : data) {
+ rowCount = ui->tableWidgetDevice->rowCount();
+ ui->tableWidgetDevice->insertRow(rowCount);
+ QTableWidgetItem* p_check = new QTableWidgetItem();
+ p_check->setCheckState(Qt::Unchecked); //设置首列为 CheckBox 控件
+ ui->tableWidgetDevice->setItem(row,0,p_check);
+
+ ui->tableWidgetDevice->setItem(row, 1, new QTableWidgetItem(QString::number(row+1)));
+ //ui->tableWidget->setItem(row, 0, new QTableWidgetItem(dept.id));
+ ui->tableWidgetDevice->setItem(row, 2, new QTableWidgetItem(myTask.sample_name)); //设置数据
+ ui->tableWidgetDevice->setItem(row, 3, new QTableWidgetItem(myTask.sample_model)); //设置数据
+ ui->tableWidgetDevice->setItem(row, 4, new QTableWidgetItem(myTask.help_instruction)); //设置数据
+ ui->tableWidgetDevice->setItem(row, 5, new QTableWidgetItem(myTask.manufacture_no)); //设置数据
+ ui->tableWidgetDevice->setItem(row, 6, new QTableWidgetItem(myTask.manufacturer)); //设置数据
+ ui->tableWidgetDevice->setItem(row, 7, new QTableWidgetItem(myTask.customer_name)); //设置数据
+ row++;
}
}
diff --git a/softwareDirectory/AutoVerScheme/newverifymethod.cpp b/softwareDirectory/AutoVerScheme/newverifymethod.cpp
index 8bab5f3..e07a035 100644
--- a/softwareDirectory/AutoVerScheme/newverifymethod.cpp
+++ b/softwareDirectory/AutoVerScheme/newverifymethod.cpp
@@ -1,5 +1,6 @@
#include "newverifymethod.h"
#include "ui_newverifymethod.h"
+#include "verifydevice.h"
NewVerifyMethod::NewVerifyMethod(QWidget *parent) :
QWidget(parent),
@@ -12,3 +13,11 @@
{
delete ui;
}
+
+void NewVerifyMethod::showVerifyDevice()
+{
+ VerifyDevice *checkWindow = new VerifyDevice;
+ checkWindow->setWindowState(Qt::WindowMaximized);
+ checkWindow->setWindowModality(Qt::ApplicationModal);
+ checkWindow->show();
+}
diff --git a/softwareDirectory/AutoVerScheme/newverifymethod.h b/softwareDirectory/AutoVerScheme/newverifymethod.h
index e17b625..46caeb4 100644
--- a/softwareDirectory/AutoVerScheme/newverifymethod.h
+++ b/softwareDirectory/AutoVerScheme/newverifymethod.h
@@ -14,7 +14,8 @@
public:
explicit NewVerifyMethod(QWidget *parent = nullptr);
~NewVerifyMethod();
-
+private slots:
+ void showVerifyDevice();
private:
Ui::NewVerifyMethod *ui;
};
diff --git a/softwareDirectory/AutoVerScheme/newverifymethod.ui b/softwareDirectory/AutoVerScheme/newverifymethod.ui
index c769a80..9fa8239 100644
--- a/softwareDirectory/AutoVerScheme/newverifymethod.ui
+++ b/softwareDirectory/AutoVerScheme/newverifymethod.ui
@@ -420,5 +420,25 @@
-
+
+
+ pushButton_13
+ clicked()
+ NewVerifyMethod
+ showVerifyDevice()
+
+
+ 1287
+ 188
+
+
+ 1340
+ 185
+
+
+
+
+
+ showVerifyDevice()
+
diff --git a/softwareDirectory/AutoVerScheme/res/res.qrc b/softwareDirectory/AutoVerScheme/res/res.qrc
index dd03a94..80e79c1 100644
--- a/softwareDirectory/AutoVerScheme/res/res.qrc
+++ b/softwareDirectory/AutoVerScheme/res/res.qrc
@@ -43,5 +43,6 @@
image/Index/u7458.svg
image/Index/u7488.svg
image/Index/u7491.svg
+ image/Index/u7538.svg
diff --git a/softwareDirectory/AutoVerScheme/standard_deviceitem.ui b/softwareDirectory/AutoVerScheme/standard_deviceitem.ui
index 86486ca..4416771 100644
--- a/softwareDirectory/AutoVerScheme/standard_deviceitem.ui
+++ b/softwareDirectory/AutoVerScheme/standard_deviceitem.ui
@@ -830,7 +830,7 @@
XXX
- 2
+ 3
false
diff --git a/softwareDirectory/AutoVerScheme/verifydevice.cpp b/softwareDirectory/AutoVerScheme/verifydevice.cpp
index dc65644..e730e57 100644
--- a/softwareDirectory/AutoVerScheme/verifydevice.cpp
+++ b/softwareDirectory/AutoVerScheme/verifydevice.cpp
@@ -1,14 +1,65 @@
#include "verifydevice.h"
#include "ui_verifydevice.h"
+#include "biz_device_manage_serve.h"
+#include
VerifyDevice::VerifyDevice(QWidget *parent) :
QWidget(parent),
ui(new Ui::VerifyDevice)
{
ui->setupUi(this);
+ ui->tableWidget->setColumnWidth(0, 80);
+ for(int i=1;i<5;i++)
+ ui->tableWidget->horizontalHeader()->setSectionResizeMode(i,QHeaderView::Stretch);
+ ui->tableWidget_2->setColumnWidth(0, 80);
+ for(int i=1;i<5;i++)
+ ui->tableWidget_2->horizontalHeader()->setSectionResizeMode(i,QHeaderView::Stretch);
+ getVerifyDevice();
+ getCheckDevice();
}
VerifyDevice::~VerifyDevice()
{
delete ui;
}
+
+void VerifyDevice::getVerifyDevice()
+{
+ BizDeviceManage dbManager;
+ // 调用数据库管理器的函数获取数据
+ int rowCount=0;
+ int row=0;
+ QList data = dbManager.getBizDeviceManage();
+ for (const BizDevice& bizDevice : data) {
+ rowCount = ui->tableWidget->rowCount();
+ ui->tableWidget->insertRow(rowCount);
+ QCheckBox *checkBox = new QCheckBox;
+ ui->tableWidget->setCellWidget(row, 0, checkBox);
+ ui->tableWidget->setItem(row, 1, new QTableWidgetItem(bizDevice.equipment_name));
+ ui->tableWidget->setItem(row, 2, new QTableWidgetItem(bizDevice.model));
+ ui->tableWidget->setItem(row, 3, new QTableWidgetItem(bizDevice.manufacture_no));
+ ui->tableWidget->setItem(row, 4, new QTableWidgetItem(bizDevice.manufacturer));
+ row++;
+ }
+}
+
+void VerifyDevice::getCheckDevice()
+{
+ BizDeviceManage dbManager;
+ // 调用数据库管理器的函数获取数据
+ int rowCount=0;
+ int row=0;
+ QList data = dbManager.getBizDeviceManage();
+ for (const BizDevice& bizDevice : data) {
+ rowCount = ui->tableWidget_2->rowCount();
+ ui->tableWidget_2->insertRow(rowCount);
+ QCheckBox *checkBox = new QCheckBox;
+ ui->tableWidget_2->setCellWidget(row, 0, checkBox);
+ ui->tableWidget_2->setItem(row, 1, new QTableWidgetItem(bizDevice.equipment_name));
+ ui->tableWidget_2->setItem(row, 2, new QTableWidgetItem(bizDevice.model));
+ ui->tableWidget_2->setItem(row, 3, new QTableWidgetItem(bizDevice.manufacture_no));
+ ui->tableWidget_2->setItem(row, 4, new QTableWidgetItem(bizDevice.manufacturer));
+ row++;
+ }
+}
+
diff --git a/softwareDirectory/AutoVerScheme/verifydevice.h b/softwareDirectory/AutoVerScheme/verifydevice.h
index 841e5e4..82afc24 100644
--- a/softwareDirectory/AutoVerScheme/verifydevice.h
+++ b/softwareDirectory/AutoVerScheme/verifydevice.h
@@ -14,6 +14,9 @@
public:
explicit VerifyDevice(QWidget *parent = nullptr);
~VerifyDevice();
+private:
+ void getVerifyDevice();
+ void getCheckDevice();
private:
Ui::VerifyDevice *ui;
diff --git a/softwareDirectory/AutoVerScheme/AutoVerScheme.pro b/softwareDirectory/AutoVerScheme/AutoVerScheme.pro
index 122d6ca..5bd9a15 100644
--- a/softwareDirectory/AutoVerScheme/AutoVerScheme.pro
+++ b/softwareDirectory/AutoVerScheme/AutoVerScheme.pro
@@ -49,6 +49,7 @@
standard_deviceitem.cpp \
testdataitem.cpp \
testview.cpp \
+ verifydevice.cpp \
verifymethodmanage.cpp \
verifywindow.cpp \
visacommonengine.cpp \
@@ -88,6 +89,7 @@
standard_deviceitem.h \
testdataitem.h \
testview.h \
+ verifydevice.h \
verifymethodmanage.h \
verifywindow.h\
biz_device_manage_serve.h \
@@ -114,6 +116,7 @@
standard_deviceitem.ui \
testdataitem.ui \
testview.ui \
+ verifydevice.ui \
verifymethodmanage.ui \
verifywindow.ui
diff --git a/softwareDirectory/AutoVerScheme/AutoVerScheme.pro.user b/softwareDirectory/AutoVerScheme/AutoVerScheme.pro.user
index 76c04be..39bcba0 100644
--- a/softwareDirectory/AutoVerScheme/AutoVerScheme.pro.user
+++ b/softwareDirectory/AutoVerScheme/AutoVerScheme.pro.user
@@ -1,6 +1,6 @@
-
+
EnvironmentId
@@ -574,6 +574,6 @@
Version
- 22
+ 22
diff --git a/softwareDirectory/AutoVerScheme/checkwindow.cpp b/softwareDirectory/AutoVerScheme/checkwindow.cpp
index 9b97f91..25134ba 100644
--- a/softwareDirectory/AutoVerScheme/checkwindow.cpp
+++ b/softwareDirectory/AutoVerScheme/checkwindow.cpp
@@ -2,6 +2,7 @@
#include "ui_checkwindow.h"
#include "dialogcheckresult.h"
#include
+#include "my_tasks_serve.h"
#include "basecommonapi.h"
CheckWindow::CheckWindow(QWidget *parent) :
@@ -57,23 +58,31 @@
void CheckWindow::getCheckDevice()
{
- QList data = BaseCommonApi::getTestedDevice();
+ MyTasks dbManager;
+ // 调用数据库管理器的函数获取数据
+ //模拟用户ID
+ QString userId="1640229293790650370";
+ QList data = dbManager.getMyTasks(userId);
int rowCount = 0;
int row=0;
QString State;
- for (const TestedDevice& device : data) {
- rowCount = ui->tableWidgetDevice->rowCount();
- ui->tableWidgetDevice->insertRow(rowCount);
- ui->tableWidgetDevice->setItem(row, 1, new QTableWidgetItem(QString::number(row+1)));
- ui->tableWidgetDevice->setItem(row, 2, new QTableWidgetItem(device.equipment_name)); //设置数据
- ui->tableWidgetDevice->setItem(row, 3, new QTableWidgetItem(device.model)); //设置数据
- ui->tableWidgetDevice->setItem(row, 4, new QTableWidgetItem(device.help_instruction)); //设置数据
- ui->tableWidgetDevice->setItem(row, 5, new QTableWidgetItem(device.manufacture_no)); //设置数据
- ui->tableWidgetDevice->setItem(row, 6, new QTableWidgetItem(device.manufacturer)); //设置数据
- ui->tableWidgetDevice->setItem(row, 7, new QTableWidgetItem(device.meter_identify)); //设置数据
- //QDebug
- row++;
+ for (const MyTask& myTask : data) {
+ rowCount = ui->tableWidgetDevice->rowCount();
+ ui->tableWidgetDevice->insertRow(rowCount);
+ QTableWidgetItem* p_check = new QTableWidgetItem();
+ p_check->setCheckState(Qt::Unchecked); //设置首列为 CheckBox 控件
+ ui->tableWidgetDevice->setItem(row,0,p_check);
+
+ ui->tableWidgetDevice->setItem(row, 1, new QTableWidgetItem(QString::number(row+1)));
+ //ui->tableWidget->setItem(row, 0, new QTableWidgetItem(dept.id));
+ ui->tableWidgetDevice->setItem(row, 2, new QTableWidgetItem(myTask.sample_name)); //设置数据
+ ui->tableWidgetDevice->setItem(row, 3, new QTableWidgetItem(myTask.sample_model)); //设置数据
+ ui->tableWidgetDevice->setItem(row, 4, new QTableWidgetItem(myTask.help_instruction)); //设置数据
+ ui->tableWidgetDevice->setItem(row, 5, new QTableWidgetItem(myTask.manufacture_no)); //设置数据
+ ui->tableWidgetDevice->setItem(row, 6, new QTableWidgetItem(myTask.manufacturer)); //设置数据
+ ui->tableWidgetDevice->setItem(row, 7, new QTableWidgetItem(myTask.customer_name)); //设置数据
+ row++;
}
}
diff --git a/softwareDirectory/AutoVerScheme/newverifymethod.cpp b/softwareDirectory/AutoVerScheme/newverifymethod.cpp
index 8bab5f3..e07a035 100644
--- a/softwareDirectory/AutoVerScheme/newverifymethod.cpp
+++ b/softwareDirectory/AutoVerScheme/newverifymethod.cpp
@@ -1,5 +1,6 @@
#include "newverifymethod.h"
#include "ui_newverifymethod.h"
+#include "verifydevice.h"
NewVerifyMethod::NewVerifyMethod(QWidget *parent) :
QWidget(parent),
@@ -12,3 +13,11 @@
{
delete ui;
}
+
+void NewVerifyMethod::showVerifyDevice()
+{
+ VerifyDevice *checkWindow = new VerifyDevice;
+ checkWindow->setWindowState(Qt::WindowMaximized);
+ checkWindow->setWindowModality(Qt::ApplicationModal);
+ checkWindow->show();
+}
diff --git a/softwareDirectory/AutoVerScheme/newverifymethod.h b/softwareDirectory/AutoVerScheme/newverifymethod.h
index e17b625..46caeb4 100644
--- a/softwareDirectory/AutoVerScheme/newverifymethod.h
+++ b/softwareDirectory/AutoVerScheme/newverifymethod.h
@@ -14,7 +14,8 @@
public:
explicit NewVerifyMethod(QWidget *parent = nullptr);
~NewVerifyMethod();
-
+private slots:
+ void showVerifyDevice();
private:
Ui::NewVerifyMethod *ui;
};
diff --git a/softwareDirectory/AutoVerScheme/newverifymethod.ui b/softwareDirectory/AutoVerScheme/newverifymethod.ui
index c769a80..9fa8239 100644
--- a/softwareDirectory/AutoVerScheme/newverifymethod.ui
+++ b/softwareDirectory/AutoVerScheme/newverifymethod.ui
@@ -420,5 +420,25 @@
-
+
+
+ pushButton_13
+ clicked()
+ NewVerifyMethod
+ showVerifyDevice()
+
+
+ 1287
+ 188
+
+
+ 1340
+ 185
+
+
+
+
+
+ showVerifyDevice()
+
diff --git a/softwareDirectory/AutoVerScheme/res/res.qrc b/softwareDirectory/AutoVerScheme/res/res.qrc
index dd03a94..80e79c1 100644
--- a/softwareDirectory/AutoVerScheme/res/res.qrc
+++ b/softwareDirectory/AutoVerScheme/res/res.qrc
@@ -43,5 +43,6 @@
image/Index/u7458.svg
image/Index/u7488.svg
image/Index/u7491.svg
+ image/Index/u7538.svg
diff --git a/softwareDirectory/AutoVerScheme/standard_deviceitem.ui b/softwareDirectory/AutoVerScheme/standard_deviceitem.ui
index 86486ca..4416771 100644
--- a/softwareDirectory/AutoVerScheme/standard_deviceitem.ui
+++ b/softwareDirectory/AutoVerScheme/standard_deviceitem.ui
@@ -830,7 +830,7 @@
XXX
- 2
+ 3
false
diff --git a/softwareDirectory/AutoVerScheme/verifydevice.cpp b/softwareDirectory/AutoVerScheme/verifydevice.cpp
index dc65644..e730e57 100644
--- a/softwareDirectory/AutoVerScheme/verifydevice.cpp
+++ b/softwareDirectory/AutoVerScheme/verifydevice.cpp
@@ -1,14 +1,65 @@
#include "verifydevice.h"
#include "ui_verifydevice.h"
+#include "biz_device_manage_serve.h"
+#include
VerifyDevice::VerifyDevice(QWidget *parent) :
QWidget(parent),
ui(new Ui::VerifyDevice)
{
ui->setupUi(this);
+ ui->tableWidget->setColumnWidth(0, 80);
+ for(int i=1;i<5;i++)
+ ui->tableWidget->horizontalHeader()->setSectionResizeMode(i,QHeaderView::Stretch);
+ ui->tableWidget_2->setColumnWidth(0, 80);
+ for(int i=1;i<5;i++)
+ ui->tableWidget_2->horizontalHeader()->setSectionResizeMode(i,QHeaderView::Stretch);
+ getVerifyDevice();
+ getCheckDevice();
}
VerifyDevice::~VerifyDevice()
{
delete ui;
}
+
+void VerifyDevice::getVerifyDevice()
+{
+ BizDeviceManage dbManager;
+ // 调用数据库管理器的函数获取数据
+ int rowCount=0;
+ int row=0;
+ QList data = dbManager.getBizDeviceManage();
+ for (const BizDevice& bizDevice : data) {
+ rowCount = ui->tableWidget->rowCount();
+ ui->tableWidget->insertRow(rowCount);
+ QCheckBox *checkBox = new QCheckBox;
+ ui->tableWidget->setCellWidget(row, 0, checkBox);
+ ui->tableWidget->setItem(row, 1, new QTableWidgetItem(bizDevice.equipment_name));
+ ui->tableWidget->setItem(row, 2, new QTableWidgetItem(bizDevice.model));
+ ui->tableWidget->setItem(row, 3, new QTableWidgetItem(bizDevice.manufacture_no));
+ ui->tableWidget->setItem(row, 4, new QTableWidgetItem(bizDevice.manufacturer));
+ row++;
+ }
+}
+
+void VerifyDevice::getCheckDevice()
+{
+ BizDeviceManage dbManager;
+ // 调用数据库管理器的函数获取数据
+ int rowCount=0;
+ int row=0;
+ QList data = dbManager.getBizDeviceManage();
+ for (const BizDevice& bizDevice : data) {
+ rowCount = ui->tableWidget_2->rowCount();
+ ui->tableWidget_2->insertRow(rowCount);
+ QCheckBox *checkBox = new QCheckBox;
+ ui->tableWidget_2->setCellWidget(row, 0, checkBox);
+ ui->tableWidget_2->setItem(row, 1, new QTableWidgetItem(bizDevice.equipment_name));
+ ui->tableWidget_2->setItem(row, 2, new QTableWidgetItem(bizDevice.model));
+ ui->tableWidget_2->setItem(row, 3, new QTableWidgetItem(bizDevice.manufacture_no));
+ ui->tableWidget_2->setItem(row, 4, new QTableWidgetItem(bizDevice.manufacturer));
+ row++;
+ }
+}
+
diff --git a/softwareDirectory/AutoVerScheme/verifydevice.h b/softwareDirectory/AutoVerScheme/verifydevice.h
index 841e5e4..82afc24 100644
--- a/softwareDirectory/AutoVerScheme/verifydevice.h
+++ b/softwareDirectory/AutoVerScheme/verifydevice.h
@@ -14,6 +14,9 @@
public:
explicit VerifyDevice(QWidget *parent = nullptr);
~VerifyDevice();
+private:
+ void getVerifyDevice();
+ void getCheckDevice();
private:
Ui::VerifyDevice *ui;
diff --git a/softwareDirectory/AutoVerScheme/verifydevice.ui b/softwareDirectory/AutoVerScheme/verifydevice.ui
index e7a63c0..eca155e 100644
--- a/softwareDirectory/AutoVerScheme/verifydevice.ui
+++ b/softwareDirectory/AutoVerScheme/verifydevice.ui
@@ -1,21 +1,498 @@
+
-
-
-
VerifyDevice
-
+
0
0
- 400
- 300
+ 949
+ 593
- Form
+ 选择设备
+
+ background-color: rgb(255, 255, 255);
+
+
+ -
+
+
+ background-color: rgb(51, 69, 130);
+
+
+
+ 10
+
+
-
+
+
+
+ 0
+ 0
+
+
+
+
+ 48
+ 48
+
+
+
+ image: url(:/image/Index/u7538.svg);
+
+
+
+
+
+
+ -
+
+
+
+ 1
+ 0
+
+
+
+
+ 18
+ 75
+ true
+
+
+
+ color: rgb(255, 255, 255);
+
+
+ 选择设备
+
+
+
+
+
+
+ -
+
+
-
+
+
-
+
+
-
+
+
+
+ 12
+
+
+
+ 选择标准设备:
+
+
+
+ -
+
+
+
+ 1
+ 0
+
+
+
+
+ 72
+ 26
+
+
+
+
+ 12
+ 75
+ true
+
+
+
+ color: rgb(255, 255, 255);
+background-color: rgb(74, 102, 186);
+border-radius:5px;
+
+
+ 查询
+
+
+
+ -
+
+
+
+ 0
+ 0
+
+
+
+
+ 72
+ 26
+
+
+
+
+ 12
+ 75
+ true
+
+
+
+ color: rgb(255, 255, 255);
+background-color: rgb(207, 132, 33);
+border-radius:5px;
+
+
+ 重置
+
+
+
+
+
+ -
+
+
-
+
+
+
+ 12
+
+
+
+ 设备名称
+
+
+
+ -
+
+
+
+ 12
+
+
+
+ 型号规格
+
+
+
+ -
+
+
+
+ 12
+
+
+
+ 出厂编号
+
+
+
+
+
+ -
+
+
+
+ 选择
+
+
+
+ 12
+
+
+
+
+
+ 设备名称
+
+
+
+ 12
+
+
+
+
+
+ 型号规格
+
+
+
+ 12
+
+
+
+
+
+ 出厂编号
+
+
+
+ 12
+
+
+
+
+
+ 生产厂家
+
+
+
+ 12
+
+
+
+
+
+
+
+ -
+
+
-
+
+
-
+
+
+
+ 12
+
+
+
+ 选择核查件:
+
+
+
+ -
+
+
+
+ 1
+ 0
+
+
+
+
+ 72
+ 26
+
+
+
+
+ 12
+ 75
+ true
+
+
+
+ color: rgb(255, 255, 255);
+background-color: rgb(74, 102, 186);
+border-radius:5px;
+
+
+ 查询
+
+
+
+ -
+
+
+
+ 0
+ 0
+
+
+
+
+ 72
+ 26
+
+
+
+
+ 12
+ 75
+ true
+
+
+
+ color: rgb(255, 255, 255);
+background-color: rgb(207, 132, 33);
+border-radius:5px;
+
+
+ 重置
+
+
+
+
+
+ -
+
+
-
+
+
+
+ 12
+
+
+
+ 设备名称
+
+
+
+ -
+
+
+
+ 12
+
+
+
+ 型号规格
+
+
+
+ -
+
+
+
+ 12
+
+
+
+ 出厂编号
+
+
+
+
+
+ -
+
+
+
+ 选择
+
+
+
+ 12
+
+
+
+
+
+ 设备名称
+
+
+
+ 12
+
+
+
+
+
+ 型号规格
+
+
+
+ 12
+
+
+
+
+
+ 出厂编号
+
+
+
+ 12
+
+
+
+
+
+ 生产厂家
+
+
+
+ 12
+
+
+
+
+
+
+
+
+
+ -
+
+
-
+
+
+ Qt::Horizontal
+
+
+
+ 40
+ 20
+
+
+
+
+ -
+
+
+
+ 1
+ 0
+
+
+
+
+ 72
+ 26
+
+
+
+
+ 12
+ 75
+ true
+
+
+
+ color: rgb(255, 255, 255);
+background-color: rgb(74, 102, 186);
+border-radius:5px;
+
+
+ 保存
+
+
+
+ -
+
+
+ Qt::Horizontal
+
+
+
+ 40
+ 20
+
+
+
+
+
+
+
-
+