diff --git a/softwareDirectory/AutoVerScheme/AutoVerScheme.pro b/softwareDirectory/AutoVerScheme/AutoVerScheme.pro index 7864245..b84a377 100644 --- a/softwareDirectory/AutoVerScheme/AutoVerScheme.pro +++ b/softwareDirectory/AutoVerScheme/AutoVerScheme.pro @@ -31,7 +31,9 @@ depar_task.cpp \ depar_task_server.cpp \ dialogcheckresult.cpp \ + formaddrsetting.cpp \ formcheckpoint.cpp \ + formcommsetting.cpp \ formverypoint.cpp \ indexwindow.cpp \ infomanageview.cpp \ @@ -53,6 +55,8 @@ wordengine.cpp HEADERS += \ + formaddrsetting.h \ + formcommsetting.h \ id/IdWorker.h \ id/Noncopyable.h \ id/Singleton.h \ @@ -102,7 +106,9 @@ datasyncview.ui \ depar_task.ui \ dialogcheckresult.ui \ + formaddrsetting.ui \ formcheckpoint.ui \ + formcommsetting.ui \ formverypoint.ui \ indexwindow.ui \ infomanageview.ui \ diff --git a/softwareDirectory/AutoVerScheme/AutoVerScheme.pro b/softwareDirectory/AutoVerScheme/AutoVerScheme.pro index 7864245..b84a377 100644 --- a/softwareDirectory/AutoVerScheme/AutoVerScheme.pro +++ b/softwareDirectory/AutoVerScheme/AutoVerScheme.pro @@ -31,7 +31,9 @@ depar_task.cpp \ depar_task_server.cpp \ dialogcheckresult.cpp \ + formaddrsetting.cpp \ formcheckpoint.cpp \ + formcommsetting.cpp \ formverypoint.cpp \ indexwindow.cpp \ infomanageview.cpp \ @@ -53,6 +55,8 @@ wordengine.cpp HEADERS += \ + formaddrsetting.h \ + formcommsetting.h \ id/IdWorker.h \ id/Noncopyable.h \ id/Singleton.h \ @@ -102,7 +106,9 @@ datasyncview.ui \ depar_task.ui \ dialogcheckresult.ui \ + formaddrsetting.ui \ formcheckpoint.ui \ + formcommsetting.ui \ formverypoint.ui \ indexwindow.ui \ infomanageview.ui \ diff --git a/softwareDirectory/AutoVerScheme/AutoVerScheme.pro.user b/softwareDirectory/AutoVerScheme/AutoVerScheme.pro.user new file mode 100644 index 0000000..2ced4d3 --- /dev/null +++ b/softwareDirectory/AutoVerScheme/AutoVerScheme.pro.user @@ -0,0 +1,562 @@ + + + + + + EnvironmentId + {2746248a-b112-4e0f-9ae0-9e61f2a42309} + + + ProjectExplorer.Project.ActiveTarget + 0 + + + ProjectExplorer.Project.EditorSettings + + true + false + true + + Cpp + + CppGlobal + + + + QmlJS + + QmlJSGlobal + + + 2 + UTF-8 + false + 4 + false + 80 + true + true + 1 + true + false + 0 + true + true + 0 + 8 + true + 1 + true + true + true + false + + + + ProjectExplorer.Project.PluginSettings + + + -fno-delayed-template-parsing + + true + + + + ProjectExplorer.Project.Target.0 + + Desktop Qt 5.14.2 MinGW 64-bit + Desktop Qt 5.14.2 MinGW 64-bit + qt.qt5.5142.win64_mingw73_kit + 0 + 0 + 0 + + D:/dev/software/softwareDirectory/build-AutoVerScheme-Desktop_Qt_5_14_2_MinGW_64_bit-Debug + + + true + QtProjectManager.QMakeBuildStep + true + + false + false + false + + + true + Qt4ProjectManager.MakeStep + + false + + + false + + 2 + Build + Build + ProjectExplorer.BuildSteps.Build + + + + true + Qt4ProjectManager.MakeStep + + true + clean + + false + + 1 + Clean + Clean + ProjectExplorer.BuildSteps.Clean + + 2 + false + + Debug + Qt4ProjectManager.Qt4BuildConfiguration + 2 + + + D:/dev/software/softwareDirectory/build-AutoVerScheme-Desktop_Qt_5_14_2_MinGW_64_bit-Release + + + true + QtProjectManager.QMakeBuildStep + false + + false + false + true + + + true + Qt4ProjectManager.MakeStep + + false + + + false + + 2 + Build + Build + ProjectExplorer.BuildSteps.Build + + + + true + Qt4ProjectManager.MakeStep + + true + clean + + false + + 1 + Clean + Clean + ProjectExplorer.BuildSteps.Clean + + 2 + false + + Release + Qt4ProjectManager.Qt4BuildConfiguration + 0 + + + D:/dev/software/softwareDirectory/build-AutoVerScheme-Desktop_Qt_5_14_2_MinGW_64_bit-Profile + + + true + QtProjectManager.QMakeBuildStep + true + + false + true + true + + + true + Qt4ProjectManager.MakeStep + + false + + + false + + 2 + Build + Build + ProjectExplorer.BuildSteps.Build + + + + true + Qt4ProjectManager.MakeStep + + true + clean + + false + + 1 + Clean + Clean + ProjectExplorer.BuildSteps.Clean + + 2 + false + + Profile + Qt4ProjectManager.Qt4BuildConfiguration + 0 + + 3 + + + 0 + Deploy + Deploy + ProjectExplorer.BuildSteps.Deploy + + 1 + ProjectExplorer.DefaultDeployConfiguration + + 1 + + + dwarf + + cpu-cycles + + + 250 + + -e + cpu-cycles + --call-graph + dwarf,4096 + -F + 250 + + -F + true + 4096 + false + false + 1000 + + true + + false + false + false + false + true + 0.01 + 10 + true + kcachegrind + 1 + 25 + + 1 + true + false + true + valgrind + + 0 + 1 + 2 + 3 + 4 + 5 + 6 + 7 + 8 + 9 + 10 + 11 + 12 + 13 + 14 + + 2 + + Qt4ProjectManager.Qt4RunConfiguration:D:/dev/software/softwareDirectory/AutoVerScheme/AutoVerScheme.pro + D:/dev/software/softwareDirectory/AutoVerScheme/AutoVerScheme.pro + + false + + false + true + true + false + false + true + + D:/dev/software/softwareDirectory/build-AutoVerScheme-Desktop_Qt_5_14_2_MinGW_64_bit-Debug + + 1 + + + + ProjectExplorer.Project.Target.1 + + Desktop Qt 5.14.2 MinGW 32-bit + Desktop Qt 5.14.2 MinGW 32-bit + qt.qt5.5142.win32_mingw73_kit + 0 + 0 + 0 + + D:/dev/software/softwareDirectory/build-AutoVerScheme-Desktop_Qt_5_14_2_MinGW_32_bit-Debug + + + true + QtProjectManager.QMakeBuildStep + true + + false + false + false + + + true + Qt4ProjectManager.MakeStep + + false + + + false + + 2 + Build + Build + ProjectExplorer.BuildSteps.Build + + + + true + Qt4ProjectManager.MakeStep + + true + clean + + false + + 1 + Clean + Clean + ProjectExplorer.BuildSteps.Clean + + 2 + false + + Debug + Qt4ProjectManager.Qt4BuildConfiguration + 2 + + + D:/dev/software/softwareDirectory/build-AutoVerScheme-Desktop_Qt_5_14_2_MinGW_32_bit-Release + + + true + QtProjectManager.QMakeBuildStep + false + + false + false + true + + + true + Qt4ProjectManager.MakeStep + + false + + + false + + 2 + Build + Build + ProjectExplorer.BuildSteps.Build + + + + true + Qt4ProjectManager.MakeStep + + true + clean + + false + + 1 + Clean + Clean + ProjectExplorer.BuildSteps.Clean + + 2 + false + + Release + Qt4ProjectManager.Qt4BuildConfiguration + 0 + + + D:/dev/software/softwareDirectory/build-AutoVerScheme-Desktop_Qt_5_14_2_MinGW_32_bit-Profile + + + true + QtProjectManager.QMakeBuildStep + true + + false + true + true + + + true + Qt4ProjectManager.MakeStep + + false + + + false + + 2 + Build + Build + ProjectExplorer.BuildSteps.Build + + + + true + Qt4ProjectManager.MakeStep + + true + clean + + false + + 1 + Clean + Clean + ProjectExplorer.BuildSteps.Clean + + 2 + false + + Profile + Qt4ProjectManager.Qt4BuildConfiguration + 0 + + 3 + + + 0 + Deploy + Deploy + ProjectExplorer.BuildSteps.Deploy + + 1 + ProjectExplorer.DefaultDeployConfiguration + + 1 + + + dwarf + + cpu-cycles + + + 250 + + -e + cpu-cycles + --call-graph + dwarf,4096 + -F + 250 + + -F + true + 4096 + false + false + 1000 + + true + + false + false + false + false + true + 0.01 + 10 + true + kcachegrind + 1 + 25 + + 1 + true + false + true + valgrind + + 0 + 1 + 2 + 3 + 4 + 5 + 6 + 7 + 8 + 9 + 10 + 11 + 12 + 13 + 14 + + 2 + + Qt4ProjectManager.Qt4RunConfiguration:D:/dev/software/softwareDirectory/AutoVerScheme/AutoVerScheme.pro + D:/dev/software/softwareDirectory/AutoVerScheme/AutoVerScheme.pro + + false + + false + true + true + false + false + true + + + + 1 + + + + ProjectExplorer.Project.TargetCount + 2 + + + ProjectExplorer.Project.Updater.FileVersion + 22 + + + Version + 22 + + diff --git a/softwareDirectory/AutoVerScheme/AutoVerScheme.pro b/softwareDirectory/AutoVerScheme/AutoVerScheme.pro index 7864245..b84a377 100644 --- a/softwareDirectory/AutoVerScheme/AutoVerScheme.pro +++ b/softwareDirectory/AutoVerScheme/AutoVerScheme.pro @@ -31,7 +31,9 @@ depar_task.cpp \ depar_task_server.cpp \ dialogcheckresult.cpp \ + formaddrsetting.cpp \ formcheckpoint.cpp \ + formcommsetting.cpp \ formverypoint.cpp \ indexwindow.cpp \ infomanageview.cpp \ @@ -53,6 +55,8 @@ wordengine.cpp HEADERS += \ + formaddrsetting.h \ + formcommsetting.h \ id/IdWorker.h \ id/Noncopyable.h \ id/Singleton.h \ @@ -102,7 +106,9 @@ datasyncview.ui \ depar_task.ui \ dialogcheckresult.ui \ + formaddrsetting.ui \ formcheckpoint.ui \ + formcommsetting.ui \ formverypoint.ui \ indexwindow.ui \ infomanageview.ui \ diff --git a/softwareDirectory/AutoVerScheme/AutoVerScheme.pro.user b/softwareDirectory/AutoVerScheme/AutoVerScheme.pro.user new file mode 100644 index 0000000..2ced4d3 --- /dev/null +++ b/softwareDirectory/AutoVerScheme/AutoVerScheme.pro.user @@ -0,0 +1,562 @@ + + + + + + EnvironmentId + {2746248a-b112-4e0f-9ae0-9e61f2a42309} + + + ProjectExplorer.Project.ActiveTarget + 0 + + + ProjectExplorer.Project.EditorSettings + + true + false + true + + Cpp + + CppGlobal + + + + QmlJS + + QmlJSGlobal + + + 2 + UTF-8 + false + 4 + false + 80 + true + true + 1 + true + false + 0 + true + true + 0 + 8 + true + 1 + true + true + true + false + + + + ProjectExplorer.Project.PluginSettings + + + -fno-delayed-template-parsing + + true + + + + ProjectExplorer.Project.Target.0 + + Desktop Qt 5.14.2 MinGW 64-bit + Desktop Qt 5.14.2 MinGW 64-bit + qt.qt5.5142.win64_mingw73_kit + 0 + 0 + 0 + + D:/dev/software/softwareDirectory/build-AutoVerScheme-Desktop_Qt_5_14_2_MinGW_64_bit-Debug + + + true + QtProjectManager.QMakeBuildStep + true + + false + false + false + + + true + Qt4ProjectManager.MakeStep + + false + + + false + + 2 + Build + Build + ProjectExplorer.BuildSteps.Build + + + + true + Qt4ProjectManager.MakeStep + + true + clean + + false + + 1 + Clean + Clean + ProjectExplorer.BuildSteps.Clean + + 2 + false + + Debug + Qt4ProjectManager.Qt4BuildConfiguration + 2 + + + D:/dev/software/softwareDirectory/build-AutoVerScheme-Desktop_Qt_5_14_2_MinGW_64_bit-Release + + + true + QtProjectManager.QMakeBuildStep + false + + false + false + true + + + true + Qt4ProjectManager.MakeStep + + false + + + false + + 2 + Build + Build + ProjectExplorer.BuildSteps.Build + + + + true + Qt4ProjectManager.MakeStep + + true + clean + + false + + 1 + Clean + Clean + ProjectExplorer.BuildSteps.Clean + + 2 + false + + Release + Qt4ProjectManager.Qt4BuildConfiguration + 0 + + + D:/dev/software/softwareDirectory/build-AutoVerScheme-Desktop_Qt_5_14_2_MinGW_64_bit-Profile + + + true + QtProjectManager.QMakeBuildStep + true + + false + true + true + + + true + Qt4ProjectManager.MakeStep + + false + + + false + + 2 + Build + Build + ProjectExplorer.BuildSteps.Build + + + + true + Qt4ProjectManager.MakeStep + + true + clean + + false + + 1 + Clean + Clean + ProjectExplorer.BuildSteps.Clean + + 2 + false + + Profile + Qt4ProjectManager.Qt4BuildConfiguration + 0 + + 3 + + + 0 + Deploy + Deploy + ProjectExplorer.BuildSteps.Deploy + + 1 + ProjectExplorer.DefaultDeployConfiguration + + 1 + + + dwarf + + cpu-cycles + + + 250 + + -e + cpu-cycles + --call-graph + dwarf,4096 + -F + 250 + + -F + true + 4096 + false + false + 1000 + + true + + false + false + false + false + true + 0.01 + 10 + true + kcachegrind + 1 + 25 + + 1 + true + false + true + valgrind + + 0 + 1 + 2 + 3 + 4 + 5 + 6 + 7 + 8 + 9 + 10 + 11 + 12 + 13 + 14 + + 2 + + Qt4ProjectManager.Qt4RunConfiguration:D:/dev/software/softwareDirectory/AutoVerScheme/AutoVerScheme.pro + D:/dev/software/softwareDirectory/AutoVerScheme/AutoVerScheme.pro + + false + + false + true + true + false + false + true + + D:/dev/software/softwareDirectory/build-AutoVerScheme-Desktop_Qt_5_14_2_MinGW_64_bit-Debug + + 1 + + + + ProjectExplorer.Project.Target.1 + + Desktop Qt 5.14.2 MinGW 32-bit + Desktop Qt 5.14.2 MinGW 32-bit + qt.qt5.5142.win32_mingw73_kit + 0 + 0 + 0 + + D:/dev/software/softwareDirectory/build-AutoVerScheme-Desktop_Qt_5_14_2_MinGW_32_bit-Debug + + + true + QtProjectManager.QMakeBuildStep + true + + false + false + false + + + true + Qt4ProjectManager.MakeStep + + false + + + false + + 2 + Build + Build + ProjectExplorer.BuildSteps.Build + + + + true + Qt4ProjectManager.MakeStep + + true + clean + + false + + 1 + Clean + Clean + ProjectExplorer.BuildSteps.Clean + + 2 + false + + Debug + Qt4ProjectManager.Qt4BuildConfiguration + 2 + + + D:/dev/software/softwareDirectory/build-AutoVerScheme-Desktop_Qt_5_14_2_MinGW_32_bit-Release + + + true + QtProjectManager.QMakeBuildStep + false + + false + false + true + + + true + Qt4ProjectManager.MakeStep + + false + + + false + + 2 + Build + Build + ProjectExplorer.BuildSteps.Build + + + + true + Qt4ProjectManager.MakeStep + + true + clean + + false + + 1 + Clean + Clean + ProjectExplorer.BuildSteps.Clean + + 2 + false + + Release + Qt4ProjectManager.Qt4BuildConfiguration + 0 + + + D:/dev/software/softwareDirectory/build-AutoVerScheme-Desktop_Qt_5_14_2_MinGW_32_bit-Profile + + + true + QtProjectManager.QMakeBuildStep + true + + false + true + true + + + true + Qt4ProjectManager.MakeStep + + false + + + false + + 2 + Build + Build + ProjectExplorer.BuildSteps.Build + + + + true + Qt4ProjectManager.MakeStep + + true + clean + + false + + 1 + Clean + Clean + ProjectExplorer.BuildSteps.Clean + + 2 + false + + Profile + Qt4ProjectManager.Qt4BuildConfiguration + 0 + + 3 + + + 0 + Deploy + Deploy + ProjectExplorer.BuildSteps.Deploy + + 1 + ProjectExplorer.DefaultDeployConfiguration + + 1 + + + dwarf + + cpu-cycles + + + 250 + + -e + cpu-cycles + --call-graph + dwarf,4096 + -F + 250 + + -F + true + 4096 + false + false + 1000 + + true + + false + false + false + false + true + 0.01 + 10 + true + kcachegrind + 1 + 25 + + 1 + true + false + true + valgrind + + 0 + 1 + 2 + 3 + 4 + 5 + 6 + 7 + 8 + 9 + 10 + 11 + 12 + 13 + 14 + + 2 + + Qt4ProjectManager.Qt4RunConfiguration:D:/dev/software/softwareDirectory/AutoVerScheme/AutoVerScheme.pro + D:/dev/software/softwareDirectory/AutoVerScheme/AutoVerScheme.pro + + false + + false + true + true + false + false + true + + + + 1 + + + + ProjectExplorer.Project.TargetCount + 2 + + + ProjectExplorer.Project.Updater.FileVersion + 22 + + + Version + 22 + + diff --git a/softwareDirectory/AutoVerScheme/checkmethodmanage.ui b/softwareDirectory/AutoVerScheme/checkmethodmanage.ui index 648509b..da56d61 100644 --- a/softwareDirectory/AutoVerScheme/checkmethodmanage.ui +++ b/softwareDirectory/AutoVerScheme/checkmethodmanage.ui @@ -123,8 +123,7 @@ color: rgb(255, 255, 255); background-color: rgb(74, 102, 186); -border-radius:5px; -padding:10px 20px; +border-radius:5px; 查询 diff --git a/softwareDirectory/AutoVerScheme/AutoVerScheme.pro b/softwareDirectory/AutoVerScheme/AutoVerScheme.pro index 7864245..b84a377 100644 --- a/softwareDirectory/AutoVerScheme/AutoVerScheme.pro +++ b/softwareDirectory/AutoVerScheme/AutoVerScheme.pro @@ -31,7 +31,9 @@ depar_task.cpp \ depar_task_server.cpp \ dialogcheckresult.cpp \ + formaddrsetting.cpp \ formcheckpoint.cpp \ + formcommsetting.cpp \ formverypoint.cpp \ indexwindow.cpp \ infomanageview.cpp \ @@ -53,6 +55,8 @@ wordengine.cpp HEADERS += \ + formaddrsetting.h \ + formcommsetting.h \ id/IdWorker.h \ id/Noncopyable.h \ id/Singleton.h \ @@ -102,7 +106,9 @@ datasyncview.ui \ depar_task.ui \ dialogcheckresult.ui \ + formaddrsetting.ui \ formcheckpoint.ui \ + formcommsetting.ui \ formverypoint.ui \ indexwindow.ui \ infomanageview.ui \ diff --git a/softwareDirectory/AutoVerScheme/AutoVerScheme.pro.user b/softwareDirectory/AutoVerScheme/AutoVerScheme.pro.user new file mode 100644 index 0000000..2ced4d3 --- /dev/null +++ b/softwareDirectory/AutoVerScheme/AutoVerScheme.pro.user @@ -0,0 +1,562 @@ + + + + + + EnvironmentId + {2746248a-b112-4e0f-9ae0-9e61f2a42309} + + + ProjectExplorer.Project.ActiveTarget + 0 + + + ProjectExplorer.Project.EditorSettings + + true + false + true + + Cpp + + CppGlobal + + + + QmlJS + + QmlJSGlobal + + + 2 + UTF-8 + false + 4 + false + 80 + true + true + 1 + true + false + 0 + true + true + 0 + 8 + true + 1 + true + true + true + false + + + + ProjectExplorer.Project.PluginSettings + + + -fno-delayed-template-parsing + + true + + + + ProjectExplorer.Project.Target.0 + + Desktop Qt 5.14.2 MinGW 64-bit + Desktop Qt 5.14.2 MinGW 64-bit + qt.qt5.5142.win64_mingw73_kit + 0 + 0 + 0 + + D:/dev/software/softwareDirectory/build-AutoVerScheme-Desktop_Qt_5_14_2_MinGW_64_bit-Debug + + + true + QtProjectManager.QMakeBuildStep + true + + false + false + false + + + true + Qt4ProjectManager.MakeStep + + false + + + false + + 2 + Build + Build + ProjectExplorer.BuildSteps.Build + + + + true + Qt4ProjectManager.MakeStep + + true + clean + + false + + 1 + Clean + Clean + ProjectExplorer.BuildSteps.Clean + + 2 + false + + Debug + Qt4ProjectManager.Qt4BuildConfiguration + 2 + + + D:/dev/software/softwareDirectory/build-AutoVerScheme-Desktop_Qt_5_14_2_MinGW_64_bit-Release + + + true + QtProjectManager.QMakeBuildStep + false + + false + false + true + + + true + Qt4ProjectManager.MakeStep + + false + + + false + + 2 + Build + Build + ProjectExplorer.BuildSteps.Build + + + + true + Qt4ProjectManager.MakeStep + + true + clean + + false + + 1 + Clean + Clean + ProjectExplorer.BuildSteps.Clean + + 2 + false + + Release + Qt4ProjectManager.Qt4BuildConfiguration + 0 + + + D:/dev/software/softwareDirectory/build-AutoVerScheme-Desktop_Qt_5_14_2_MinGW_64_bit-Profile + + + true + QtProjectManager.QMakeBuildStep + true + + false + true + true + + + true + Qt4ProjectManager.MakeStep + + false + + + false + + 2 + Build + Build + ProjectExplorer.BuildSteps.Build + + + + true + Qt4ProjectManager.MakeStep + + true + clean + + false + + 1 + Clean + Clean + ProjectExplorer.BuildSteps.Clean + + 2 + false + + Profile + Qt4ProjectManager.Qt4BuildConfiguration + 0 + + 3 + + + 0 + Deploy + Deploy + ProjectExplorer.BuildSteps.Deploy + + 1 + ProjectExplorer.DefaultDeployConfiguration + + 1 + + + dwarf + + cpu-cycles + + + 250 + + -e + cpu-cycles + --call-graph + dwarf,4096 + -F + 250 + + -F + true + 4096 + false + false + 1000 + + true + + false + false + false + false + true + 0.01 + 10 + true + kcachegrind + 1 + 25 + + 1 + true + false + true + valgrind + + 0 + 1 + 2 + 3 + 4 + 5 + 6 + 7 + 8 + 9 + 10 + 11 + 12 + 13 + 14 + + 2 + + Qt4ProjectManager.Qt4RunConfiguration:D:/dev/software/softwareDirectory/AutoVerScheme/AutoVerScheme.pro + D:/dev/software/softwareDirectory/AutoVerScheme/AutoVerScheme.pro + + false + + false + true + true + false + false + true + + D:/dev/software/softwareDirectory/build-AutoVerScheme-Desktop_Qt_5_14_2_MinGW_64_bit-Debug + + 1 + + + + ProjectExplorer.Project.Target.1 + + Desktop Qt 5.14.2 MinGW 32-bit + Desktop Qt 5.14.2 MinGW 32-bit + qt.qt5.5142.win32_mingw73_kit + 0 + 0 + 0 + + D:/dev/software/softwareDirectory/build-AutoVerScheme-Desktop_Qt_5_14_2_MinGW_32_bit-Debug + + + true + QtProjectManager.QMakeBuildStep + true + + false + false + false + + + true + Qt4ProjectManager.MakeStep + + false + + + false + + 2 + Build + Build + ProjectExplorer.BuildSteps.Build + + + + true + Qt4ProjectManager.MakeStep + + true + clean + + false + + 1 + Clean + Clean + ProjectExplorer.BuildSteps.Clean + + 2 + false + + Debug + Qt4ProjectManager.Qt4BuildConfiguration + 2 + + + D:/dev/software/softwareDirectory/build-AutoVerScheme-Desktop_Qt_5_14_2_MinGW_32_bit-Release + + + true + QtProjectManager.QMakeBuildStep + false + + false + false + true + + + true + Qt4ProjectManager.MakeStep + + false + + + false + + 2 + Build + Build + ProjectExplorer.BuildSteps.Build + + + + true + Qt4ProjectManager.MakeStep + + true + clean + + false + + 1 + Clean + Clean + ProjectExplorer.BuildSteps.Clean + + 2 + false + + Release + Qt4ProjectManager.Qt4BuildConfiguration + 0 + + + D:/dev/software/softwareDirectory/build-AutoVerScheme-Desktop_Qt_5_14_2_MinGW_32_bit-Profile + + + true + QtProjectManager.QMakeBuildStep + true + + false + true + true + + + true + Qt4ProjectManager.MakeStep + + false + + + false + + 2 + Build + Build + ProjectExplorer.BuildSteps.Build + + + + true + Qt4ProjectManager.MakeStep + + true + clean + + false + + 1 + Clean + Clean + ProjectExplorer.BuildSteps.Clean + + 2 + false + + Profile + Qt4ProjectManager.Qt4BuildConfiguration + 0 + + 3 + + + 0 + Deploy + Deploy + ProjectExplorer.BuildSteps.Deploy + + 1 + ProjectExplorer.DefaultDeployConfiguration + + 1 + + + dwarf + + cpu-cycles + + + 250 + + -e + cpu-cycles + --call-graph + dwarf,4096 + -F + 250 + + -F + true + 4096 + false + false + 1000 + + true + + false + false + false + false + true + 0.01 + 10 + true + kcachegrind + 1 + 25 + + 1 + true + false + true + valgrind + + 0 + 1 + 2 + 3 + 4 + 5 + 6 + 7 + 8 + 9 + 10 + 11 + 12 + 13 + 14 + + 2 + + Qt4ProjectManager.Qt4RunConfiguration:D:/dev/software/softwareDirectory/AutoVerScheme/AutoVerScheme.pro + D:/dev/software/softwareDirectory/AutoVerScheme/AutoVerScheme.pro + + false + + false + true + true + false + false + true + + + + 1 + + + + ProjectExplorer.Project.TargetCount + 2 + + + ProjectExplorer.Project.Updater.FileVersion + 22 + + + Version + 22 + + diff --git a/softwareDirectory/AutoVerScheme/checkmethodmanage.ui b/softwareDirectory/AutoVerScheme/checkmethodmanage.ui index 648509b..da56d61 100644 --- a/softwareDirectory/AutoVerScheme/checkmethodmanage.ui +++ b/softwareDirectory/AutoVerScheme/checkmethodmanage.ui @@ -123,8 +123,7 @@ color: rgb(255, 255, 255); background-color: rgb(74, 102, 186); -border-radius:5px; -padding:10px 20px; +border-radius:5px; 查询 diff --git a/softwareDirectory/AutoVerScheme/checkwindow.cpp b/softwareDirectory/AutoVerScheme/checkwindow.cpp index 51650f9..da86ad4 100644 --- a/softwareDirectory/AutoVerScheme/checkwindow.cpp +++ b/softwareDirectory/AutoVerScheme/checkwindow.cpp @@ -9,12 +9,17 @@ ui(new Ui::CheckWindow) { ui->setupUi(this); - ui->tableWidgetDevice->setColumnCount(8); - ui->tableWidgetMethod->setColumnCount(7); + //ui->tableWidgetDevice->setColumnCount(8); + //ui->tableWidgetMethod->setColumnCount(7); + ui->tableWidgetDevice->verticalHeader()->setParent(nullptr); for(int i=2;i<8;i++) ui->tableWidgetDevice->horizontalHeader()->setSectionResizeMode(i,QHeaderView::Stretch); - for(int i=2;i<7;i++) + ui->tableWidgetMethod->verticalHeader()->setParent(nullptr); //隐藏行头 + for(int i=1;i<5;i++) ui->tableWidgetMethod->horizontalHeader()->setSectionResizeMode(i,QHeaderView::Stretch); + ui->tableWidgetMethod->setColumnWidth(0, 60); + ui->tableWidgetMethod->setColumnWidth(5, 100); + ui->tableWidget_3->verticalHeader()->setParent(nullptr); for(int i=0;i<2;i++) ui->tableWidget_3->horizontalHeader()->setSectionResizeMode(i,QHeaderView::Stretch); getCheckDevice(); @@ -24,12 +29,15 @@ CheckWindow::~CheckWindow() { + myTaskList.clear(); + programList.clear(); delete ui; } void CheckWindow::showMethod() { ui->stackedWidget->setCurrentIndex(1); + getCheckMethod(); } void CheckWindow::showDevice() @@ -46,6 +54,7 @@ { ui->stackedWidget_2->setCurrentIndex(0); ui->stackedWidget->setCurrentIndex(0); + getCheckDevice(); } void CheckWindow::showResult() @@ -57,18 +66,17 @@ void CheckWindow::getCheckDevice() { - - BaseCommonApi dbManager; - // 调用数据库管理器的函数获取数据 - + myTaskList.clear(); + ui->tableWidgetDevice->clearContents(); + ui->tableWidgetDevice->setRowCount(0); //模拟用户ID - QString userId="1640229293790650370"; - QList data = BaseCommonApi::getMyTasks(userId,"3"); + QString userId="1695282436182188034"; + myTaskList = BaseCommonApi::getMyTasks(userId,"3"); int rowCount = 0; int row=0; QString State; - for (const MyTask& myTask : data) { + for (const MyTask& myTask : myTaskList) { rowCount = ui->tableWidgetDevice->rowCount(); ui->tableWidgetDevice->insertRow(rowCount); @@ -87,3 +95,49 @@ row++; } } + +void CheckWindow::getCheckMethod() +{ + programList.clear(); + ui->tableWidgetMethod->clearContents(); + ui->tableWidgetMethod->setRowCount(0); + programList = BaseCommonApi::getVerificationProgramInfoMain(); + int rowCount = 0; + int row=0; + for (const VerificationProgramInfo& program : programList) { + rowCount = ui->tableWidgetMethod->rowCount(); + + ui->tableWidgetMethod->insertRow(rowCount); + QTableWidgetItem* p_check = new QTableWidgetItem(); + p_check->setCheckState(Qt::Unchecked); //设置首列为 CheckBox 控件 + ui->tableWidgetMethod->setItem(row,0,p_check); + ui->tableWidgetMethod->setItem(row, 1, new QTableWidgetItem(program.program_name)); //设置数据 + ui->tableWidgetMethod->setItem(row, 2, new QTableWidgetItem(program.create_name)); //设置数据 + ui->tableWidgetMethod->setItem(row, 3, new QTableWidgetItem(program.create_time.toString())); //设置数据 + ui->tableWidgetMethod->setItem(row, 4, new QTableWidgetItem(program.remark)); //设置数据 + + QPushButton *btn_1 = new QPushButton(); + btn_1->setText(tr("详情")); + btn_1->setStyleSheet("QPushButton{" + "background-color:rgba(255,255,255,0);" + "color:rgba(0,0,255,100);" + "text-decoration:underline;" + "}"); + btn_1->setCursor(Qt::PointingHandCursor); + connect(btn_1,SIGNAL(clicked()),this,SLOT(on_editButton_clicked())); + + btn_1->setIconSize(QSize(16,16)); + btn_1->setIcon(QIcon(":/image/Index/u2324.svg")); + QWidget *tmp_widget = new QWidget(); + QHBoxLayout *tmp_layout = new QHBoxLayout(tmp_widget); + tmp_layout->addWidget(btn_1); + tmp_layout->setMargin(0); + ui->tableWidgetMethod->setCellWidget(row,5,tmp_widget); + row++; + } +} + +void CheckWindow::on_editButton_clicked() +{ + +} diff --git a/softwareDirectory/AutoVerScheme/AutoVerScheme.pro b/softwareDirectory/AutoVerScheme/AutoVerScheme.pro index 7864245..b84a377 100644 --- a/softwareDirectory/AutoVerScheme/AutoVerScheme.pro +++ b/softwareDirectory/AutoVerScheme/AutoVerScheme.pro @@ -31,7 +31,9 @@ depar_task.cpp \ depar_task_server.cpp \ dialogcheckresult.cpp \ + formaddrsetting.cpp \ formcheckpoint.cpp \ + formcommsetting.cpp \ formverypoint.cpp \ indexwindow.cpp \ infomanageview.cpp \ @@ -53,6 +55,8 @@ wordengine.cpp HEADERS += \ + formaddrsetting.h \ + formcommsetting.h \ id/IdWorker.h \ id/Noncopyable.h \ id/Singleton.h \ @@ -102,7 +106,9 @@ datasyncview.ui \ depar_task.ui \ dialogcheckresult.ui \ + formaddrsetting.ui \ formcheckpoint.ui \ + formcommsetting.ui \ formverypoint.ui \ indexwindow.ui \ infomanageview.ui \ diff --git a/softwareDirectory/AutoVerScheme/AutoVerScheme.pro.user b/softwareDirectory/AutoVerScheme/AutoVerScheme.pro.user new file mode 100644 index 0000000..2ced4d3 --- /dev/null +++ b/softwareDirectory/AutoVerScheme/AutoVerScheme.pro.user @@ -0,0 +1,562 @@ + + + + + + EnvironmentId + {2746248a-b112-4e0f-9ae0-9e61f2a42309} + + + ProjectExplorer.Project.ActiveTarget + 0 + + + ProjectExplorer.Project.EditorSettings + + true + false + true + + Cpp + + CppGlobal + + + + QmlJS + + QmlJSGlobal + + + 2 + UTF-8 + false + 4 + false + 80 + true + true + 1 + true + false + 0 + true + true + 0 + 8 + true + 1 + true + true + true + false + + + + ProjectExplorer.Project.PluginSettings + + + -fno-delayed-template-parsing + + true + + + + ProjectExplorer.Project.Target.0 + + Desktop Qt 5.14.2 MinGW 64-bit + Desktop Qt 5.14.2 MinGW 64-bit + qt.qt5.5142.win64_mingw73_kit + 0 + 0 + 0 + + D:/dev/software/softwareDirectory/build-AutoVerScheme-Desktop_Qt_5_14_2_MinGW_64_bit-Debug + + + true + QtProjectManager.QMakeBuildStep + true + + false + false + false + + + true + Qt4ProjectManager.MakeStep + + false + + + false + + 2 + Build + Build + ProjectExplorer.BuildSteps.Build + + + + true + Qt4ProjectManager.MakeStep + + true + clean + + false + + 1 + Clean + Clean + ProjectExplorer.BuildSteps.Clean + + 2 + false + + Debug + Qt4ProjectManager.Qt4BuildConfiguration + 2 + + + D:/dev/software/softwareDirectory/build-AutoVerScheme-Desktop_Qt_5_14_2_MinGW_64_bit-Release + + + true + QtProjectManager.QMakeBuildStep + false + + false + false + true + + + true + Qt4ProjectManager.MakeStep + + false + + + false + + 2 + Build + Build + ProjectExplorer.BuildSteps.Build + + + + true + Qt4ProjectManager.MakeStep + + true + clean + + false + + 1 + Clean + Clean + ProjectExplorer.BuildSteps.Clean + + 2 + false + + Release + Qt4ProjectManager.Qt4BuildConfiguration + 0 + + + D:/dev/software/softwareDirectory/build-AutoVerScheme-Desktop_Qt_5_14_2_MinGW_64_bit-Profile + + + true + QtProjectManager.QMakeBuildStep + true + + false + true + true + + + true + Qt4ProjectManager.MakeStep + + false + + + false + + 2 + Build + Build + ProjectExplorer.BuildSteps.Build + + + + true + Qt4ProjectManager.MakeStep + + true + clean + + false + + 1 + Clean + Clean + ProjectExplorer.BuildSteps.Clean + + 2 + false + + Profile + Qt4ProjectManager.Qt4BuildConfiguration + 0 + + 3 + + + 0 + Deploy + Deploy + ProjectExplorer.BuildSteps.Deploy + + 1 + ProjectExplorer.DefaultDeployConfiguration + + 1 + + + dwarf + + cpu-cycles + + + 250 + + -e + cpu-cycles + --call-graph + dwarf,4096 + -F + 250 + + -F + true + 4096 + false + false + 1000 + + true + + false + false + false + false + true + 0.01 + 10 + true + kcachegrind + 1 + 25 + + 1 + true + false + true + valgrind + + 0 + 1 + 2 + 3 + 4 + 5 + 6 + 7 + 8 + 9 + 10 + 11 + 12 + 13 + 14 + + 2 + + Qt4ProjectManager.Qt4RunConfiguration:D:/dev/software/softwareDirectory/AutoVerScheme/AutoVerScheme.pro + D:/dev/software/softwareDirectory/AutoVerScheme/AutoVerScheme.pro + + false + + false + true + true + false + false + true + + D:/dev/software/softwareDirectory/build-AutoVerScheme-Desktop_Qt_5_14_2_MinGW_64_bit-Debug + + 1 + + + + ProjectExplorer.Project.Target.1 + + Desktop Qt 5.14.2 MinGW 32-bit + Desktop Qt 5.14.2 MinGW 32-bit + qt.qt5.5142.win32_mingw73_kit + 0 + 0 + 0 + + D:/dev/software/softwareDirectory/build-AutoVerScheme-Desktop_Qt_5_14_2_MinGW_32_bit-Debug + + + true + QtProjectManager.QMakeBuildStep + true + + false + false + false + + + true + Qt4ProjectManager.MakeStep + + false + + + false + + 2 + Build + Build + ProjectExplorer.BuildSteps.Build + + + + true + Qt4ProjectManager.MakeStep + + true + clean + + false + + 1 + Clean + Clean + ProjectExplorer.BuildSteps.Clean + + 2 + false + + Debug + Qt4ProjectManager.Qt4BuildConfiguration + 2 + + + D:/dev/software/softwareDirectory/build-AutoVerScheme-Desktop_Qt_5_14_2_MinGW_32_bit-Release + + + true + QtProjectManager.QMakeBuildStep + false + + false + false + true + + + true + Qt4ProjectManager.MakeStep + + false + + + false + + 2 + Build + Build + ProjectExplorer.BuildSteps.Build + + + + true + Qt4ProjectManager.MakeStep + + true + clean + + false + + 1 + Clean + Clean + ProjectExplorer.BuildSteps.Clean + + 2 + false + + Release + Qt4ProjectManager.Qt4BuildConfiguration + 0 + + + D:/dev/software/softwareDirectory/build-AutoVerScheme-Desktop_Qt_5_14_2_MinGW_32_bit-Profile + + + true + QtProjectManager.QMakeBuildStep + true + + false + true + true + + + true + Qt4ProjectManager.MakeStep + + false + + + false + + 2 + Build + Build + ProjectExplorer.BuildSteps.Build + + + + true + Qt4ProjectManager.MakeStep + + true + clean + + false + + 1 + Clean + Clean + ProjectExplorer.BuildSteps.Clean + + 2 + false + + Profile + Qt4ProjectManager.Qt4BuildConfiguration + 0 + + 3 + + + 0 + Deploy + Deploy + ProjectExplorer.BuildSteps.Deploy + + 1 + ProjectExplorer.DefaultDeployConfiguration + + 1 + + + dwarf + + cpu-cycles + + + 250 + + -e + cpu-cycles + --call-graph + dwarf,4096 + -F + 250 + + -F + true + 4096 + false + false + 1000 + + true + + false + false + false + false + true + 0.01 + 10 + true + kcachegrind + 1 + 25 + + 1 + true + false + true + valgrind + + 0 + 1 + 2 + 3 + 4 + 5 + 6 + 7 + 8 + 9 + 10 + 11 + 12 + 13 + 14 + + 2 + + Qt4ProjectManager.Qt4RunConfiguration:D:/dev/software/softwareDirectory/AutoVerScheme/AutoVerScheme.pro + D:/dev/software/softwareDirectory/AutoVerScheme/AutoVerScheme.pro + + false + + false + true + true + false + false + true + + + + 1 + + + + ProjectExplorer.Project.TargetCount + 2 + + + ProjectExplorer.Project.Updater.FileVersion + 22 + + + Version + 22 + + diff --git a/softwareDirectory/AutoVerScheme/checkmethodmanage.ui b/softwareDirectory/AutoVerScheme/checkmethodmanage.ui index 648509b..da56d61 100644 --- a/softwareDirectory/AutoVerScheme/checkmethodmanage.ui +++ b/softwareDirectory/AutoVerScheme/checkmethodmanage.ui @@ -123,8 +123,7 @@ color: rgb(255, 255, 255); background-color: rgb(74, 102, 186); -border-radius:5px; -padding:10px 20px; +border-radius:5px; 查询 diff --git a/softwareDirectory/AutoVerScheme/checkwindow.cpp b/softwareDirectory/AutoVerScheme/checkwindow.cpp index 51650f9..da86ad4 100644 --- a/softwareDirectory/AutoVerScheme/checkwindow.cpp +++ b/softwareDirectory/AutoVerScheme/checkwindow.cpp @@ -9,12 +9,17 @@ ui(new Ui::CheckWindow) { ui->setupUi(this); - ui->tableWidgetDevice->setColumnCount(8); - ui->tableWidgetMethod->setColumnCount(7); + //ui->tableWidgetDevice->setColumnCount(8); + //ui->tableWidgetMethod->setColumnCount(7); + ui->tableWidgetDevice->verticalHeader()->setParent(nullptr); for(int i=2;i<8;i++) ui->tableWidgetDevice->horizontalHeader()->setSectionResizeMode(i,QHeaderView::Stretch); - for(int i=2;i<7;i++) + ui->tableWidgetMethod->verticalHeader()->setParent(nullptr); //隐藏行头 + for(int i=1;i<5;i++) ui->tableWidgetMethod->horizontalHeader()->setSectionResizeMode(i,QHeaderView::Stretch); + ui->tableWidgetMethod->setColumnWidth(0, 60); + ui->tableWidgetMethod->setColumnWidth(5, 100); + ui->tableWidget_3->verticalHeader()->setParent(nullptr); for(int i=0;i<2;i++) ui->tableWidget_3->horizontalHeader()->setSectionResizeMode(i,QHeaderView::Stretch); getCheckDevice(); @@ -24,12 +29,15 @@ CheckWindow::~CheckWindow() { + myTaskList.clear(); + programList.clear(); delete ui; } void CheckWindow::showMethod() { ui->stackedWidget->setCurrentIndex(1); + getCheckMethod(); } void CheckWindow::showDevice() @@ -46,6 +54,7 @@ { ui->stackedWidget_2->setCurrentIndex(0); ui->stackedWidget->setCurrentIndex(0); + getCheckDevice(); } void CheckWindow::showResult() @@ -57,18 +66,17 @@ void CheckWindow::getCheckDevice() { - - BaseCommonApi dbManager; - // 调用数据库管理器的函数获取数据 - + myTaskList.clear(); + ui->tableWidgetDevice->clearContents(); + ui->tableWidgetDevice->setRowCount(0); //模拟用户ID - QString userId="1640229293790650370"; - QList data = BaseCommonApi::getMyTasks(userId,"3"); + QString userId="1695282436182188034"; + myTaskList = BaseCommonApi::getMyTasks(userId,"3"); int rowCount = 0; int row=0; QString State; - for (const MyTask& myTask : data) { + for (const MyTask& myTask : myTaskList) { rowCount = ui->tableWidgetDevice->rowCount(); ui->tableWidgetDevice->insertRow(rowCount); @@ -87,3 +95,49 @@ row++; } } + +void CheckWindow::getCheckMethod() +{ + programList.clear(); + ui->tableWidgetMethod->clearContents(); + ui->tableWidgetMethod->setRowCount(0); + programList = BaseCommonApi::getVerificationProgramInfoMain(); + int rowCount = 0; + int row=0; + for (const VerificationProgramInfo& program : programList) { + rowCount = ui->tableWidgetMethod->rowCount(); + + ui->tableWidgetMethod->insertRow(rowCount); + QTableWidgetItem* p_check = new QTableWidgetItem(); + p_check->setCheckState(Qt::Unchecked); //设置首列为 CheckBox 控件 + ui->tableWidgetMethod->setItem(row,0,p_check); + ui->tableWidgetMethod->setItem(row, 1, new QTableWidgetItem(program.program_name)); //设置数据 + ui->tableWidgetMethod->setItem(row, 2, new QTableWidgetItem(program.create_name)); //设置数据 + ui->tableWidgetMethod->setItem(row, 3, new QTableWidgetItem(program.create_time.toString())); //设置数据 + ui->tableWidgetMethod->setItem(row, 4, new QTableWidgetItem(program.remark)); //设置数据 + + QPushButton *btn_1 = new QPushButton(); + btn_1->setText(tr("详情")); + btn_1->setStyleSheet("QPushButton{" + "background-color:rgba(255,255,255,0);" + "color:rgba(0,0,255,100);" + "text-decoration:underline;" + "}"); + btn_1->setCursor(Qt::PointingHandCursor); + connect(btn_1,SIGNAL(clicked()),this,SLOT(on_editButton_clicked())); + + btn_1->setIconSize(QSize(16,16)); + btn_1->setIcon(QIcon(":/image/Index/u2324.svg")); + QWidget *tmp_widget = new QWidget(); + QHBoxLayout *tmp_layout = new QHBoxLayout(tmp_widget); + tmp_layout->addWidget(btn_1); + tmp_layout->setMargin(0); + ui->tableWidgetMethod->setCellWidget(row,5,tmp_widget); + row++; + } +} + +void CheckWindow::on_editButton_clicked() +{ + +} diff --git a/softwareDirectory/AutoVerScheme/checkwindow.h b/softwareDirectory/AutoVerScheme/checkwindow.h index 005a85a..ea27646 100644 --- a/softwareDirectory/AutoVerScheme/checkwindow.h +++ b/softwareDirectory/AutoVerScheme/checkwindow.h @@ -2,6 +2,7 @@ #define CHECKWINDOW_H #include +#include "basecommonapi.h" namespace Ui { class CheckWindow; @@ -20,10 +21,14 @@ void showCheck(); void showMethodWidget(); void showResult(); + void on_editButton_clicked(); private: void getCheckDevice(); + void getCheckMethod(); private: Ui::CheckWindow *ui; + QList programList; + QList myTaskList; }; #endif // CHECKWINDOW_H diff --git a/softwareDirectory/AutoVerScheme/AutoVerScheme.pro b/softwareDirectory/AutoVerScheme/AutoVerScheme.pro index 7864245..b84a377 100644 --- a/softwareDirectory/AutoVerScheme/AutoVerScheme.pro +++ b/softwareDirectory/AutoVerScheme/AutoVerScheme.pro @@ -31,7 +31,9 @@ depar_task.cpp \ depar_task_server.cpp \ dialogcheckresult.cpp \ + formaddrsetting.cpp \ formcheckpoint.cpp \ + formcommsetting.cpp \ formverypoint.cpp \ indexwindow.cpp \ infomanageview.cpp \ @@ -53,6 +55,8 @@ wordengine.cpp HEADERS += \ + formaddrsetting.h \ + formcommsetting.h \ id/IdWorker.h \ id/Noncopyable.h \ id/Singleton.h \ @@ -102,7 +106,9 @@ datasyncview.ui \ depar_task.ui \ dialogcheckresult.ui \ + formaddrsetting.ui \ formcheckpoint.ui \ + formcommsetting.ui \ formverypoint.ui \ indexwindow.ui \ infomanageview.ui \ diff --git a/softwareDirectory/AutoVerScheme/AutoVerScheme.pro.user b/softwareDirectory/AutoVerScheme/AutoVerScheme.pro.user new file mode 100644 index 0000000..2ced4d3 --- /dev/null +++ b/softwareDirectory/AutoVerScheme/AutoVerScheme.pro.user @@ -0,0 +1,562 @@ + + + + + + EnvironmentId + {2746248a-b112-4e0f-9ae0-9e61f2a42309} + + + ProjectExplorer.Project.ActiveTarget + 0 + + + ProjectExplorer.Project.EditorSettings + + true + false + true + + Cpp + + CppGlobal + + + + QmlJS + + QmlJSGlobal + + + 2 + UTF-8 + false + 4 + false + 80 + true + true + 1 + true + false + 0 + true + true + 0 + 8 + true + 1 + true + true + true + false + + + + ProjectExplorer.Project.PluginSettings + + + -fno-delayed-template-parsing + + true + + + + ProjectExplorer.Project.Target.0 + + Desktop Qt 5.14.2 MinGW 64-bit + Desktop Qt 5.14.2 MinGW 64-bit + qt.qt5.5142.win64_mingw73_kit + 0 + 0 + 0 + + D:/dev/software/softwareDirectory/build-AutoVerScheme-Desktop_Qt_5_14_2_MinGW_64_bit-Debug + + + true + QtProjectManager.QMakeBuildStep + true + + false + false + false + + + true + Qt4ProjectManager.MakeStep + + false + + + false + + 2 + Build + Build + ProjectExplorer.BuildSteps.Build + + + + true + Qt4ProjectManager.MakeStep + + true + clean + + false + + 1 + Clean + Clean + ProjectExplorer.BuildSteps.Clean + + 2 + false + + Debug + Qt4ProjectManager.Qt4BuildConfiguration + 2 + + + D:/dev/software/softwareDirectory/build-AutoVerScheme-Desktop_Qt_5_14_2_MinGW_64_bit-Release + + + true + QtProjectManager.QMakeBuildStep + false + + false + false + true + + + true + Qt4ProjectManager.MakeStep + + false + + + false + + 2 + Build + Build + ProjectExplorer.BuildSteps.Build + + + + true + Qt4ProjectManager.MakeStep + + true + clean + + false + + 1 + Clean + Clean + ProjectExplorer.BuildSteps.Clean + + 2 + false + + Release + Qt4ProjectManager.Qt4BuildConfiguration + 0 + + + D:/dev/software/softwareDirectory/build-AutoVerScheme-Desktop_Qt_5_14_2_MinGW_64_bit-Profile + + + true + QtProjectManager.QMakeBuildStep + true + + false + true + true + + + true + Qt4ProjectManager.MakeStep + + false + + + false + + 2 + Build + Build + ProjectExplorer.BuildSteps.Build + + + + true + Qt4ProjectManager.MakeStep + + true + clean + + false + + 1 + Clean + Clean + ProjectExplorer.BuildSteps.Clean + + 2 + false + + Profile + Qt4ProjectManager.Qt4BuildConfiguration + 0 + + 3 + + + 0 + Deploy + Deploy + ProjectExplorer.BuildSteps.Deploy + + 1 + ProjectExplorer.DefaultDeployConfiguration + + 1 + + + dwarf + + cpu-cycles + + + 250 + + -e + cpu-cycles + --call-graph + dwarf,4096 + -F + 250 + + -F + true + 4096 + false + false + 1000 + + true + + false + false + false + false + true + 0.01 + 10 + true + kcachegrind + 1 + 25 + + 1 + true + false + true + valgrind + + 0 + 1 + 2 + 3 + 4 + 5 + 6 + 7 + 8 + 9 + 10 + 11 + 12 + 13 + 14 + + 2 + + Qt4ProjectManager.Qt4RunConfiguration:D:/dev/software/softwareDirectory/AutoVerScheme/AutoVerScheme.pro + D:/dev/software/softwareDirectory/AutoVerScheme/AutoVerScheme.pro + + false + + false + true + true + false + false + true + + D:/dev/software/softwareDirectory/build-AutoVerScheme-Desktop_Qt_5_14_2_MinGW_64_bit-Debug + + 1 + + + + ProjectExplorer.Project.Target.1 + + Desktop Qt 5.14.2 MinGW 32-bit + Desktop Qt 5.14.2 MinGW 32-bit + qt.qt5.5142.win32_mingw73_kit + 0 + 0 + 0 + + D:/dev/software/softwareDirectory/build-AutoVerScheme-Desktop_Qt_5_14_2_MinGW_32_bit-Debug + + + true + QtProjectManager.QMakeBuildStep + true + + false + false + false + + + true + Qt4ProjectManager.MakeStep + + false + + + false + + 2 + Build + Build + ProjectExplorer.BuildSteps.Build + + + + true + Qt4ProjectManager.MakeStep + + true + clean + + false + + 1 + Clean + Clean + ProjectExplorer.BuildSteps.Clean + + 2 + false + + Debug + Qt4ProjectManager.Qt4BuildConfiguration + 2 + + + D:/dev/software/softwareDirectory/build-AutoVerScheme-Desktop_Qt_5_14_2_MinGW_32_bit-Release + + + true + QtProjectManager.QMakeBuildStep + false + + false + false + true + + + true + Qt4ProjectManager.MakeStep + + false + + + false + + 2 + Build + Build + ProjectExplorer.BuildSteps.Build + + + + true + Qt4ProjectManager.MakeStep + + true + clean + + false + + 1 + Clean + Clean + ProjectExplorer.BuildSteps.Clean + + 2 + false + + Release + Qt4ProjectManager.Qt4BuildConfiguration + 0 + + + D:/dev/software/softwareDirectory/build-AutoVerScheme-Desktop_Qt_5_14_2_MinGW_32_bit-Profile + + + true + QtProjectManager.QMakeBuildStep + true + + false + true + true + + + true + Qt4ProjectManager.MakeStep + + false + + + false + + 2 + Build + Build + ProjectExplorer.BuildSteps.Build + + + + true + Qt4ProjectManager.MakeStep + + true + clean + + false + + 1 + Clean + Clean + ProjectExplorer.BuildSteps.Clean + + 2 + false + + Profile + Qt4ProjectManager.Qt4BuildConfiguration + 0 + + 3 + + + 0 + Deploy + Deploy + ProjectExplorer.BuildSteps.Deploy + + 1 + ProjectExplorer.DefaultDeployConfiguration + + 1 + + + dwarf + + cpu-cycles + + + 250 + + -e + cpu-cycles + --call-graph + dwarf,4096 + -F + 250 + + -F + true + 4096 + false + false + 1000 + + true + + false + false + false + false + true + 0.01 + 10 + true + kcachegrind + 1 + 25 + + 1 + true + false + true + valgrind + + 0 + 1 + 2 + 3 + 4 + 5 + 6 + 7 + 8 + 9 + 10 + 11 + 12 + 13 + 14 + + 2 + + Qt4ProjectManager.Qt4RunConfiguration:D:/dev/software/softwareDirectory/AutoVerScheme/AutoVerScheme.pro + D:/dev/software/softwareDirectory/AutoVerScheme/AutoVerScheme.pro + + false + + false + true + true + false + false + true + + + + 1 + + + + ProjectExplorer.Project.TargetCount + 2 + + + ProjectExplorer.Project.Updater.FileVersion + 22 + + + Version + 22 + + diff --git a/softwareDirectory/AutoVerScheme/checkmethodmanage.ui b/softwareDirectory/AutoVerScheme/checkmethodmanage.ui index 648509b..da56d61 100644 --- a/softwareDirectory/AutoVerScheme/checkmethodmanage.ui +++ b/softwareDirectory/AutoVerScheme/checkmethodmanage.ui @@ -123,8 +123,7 @@ color: rgb(255, 255, 255); background-color: rgb(74, 102, 186); -border-radius:5px; -padding:10px 20px; +border-radius:5px; 查询 diff --git a/softwareDirectory/AutoVerScheme/checkwindow.cpp b/softwareDirectory/AutoVerScheme/checkwindow.cpp index 51650f9..da86ad4 100644 --- a/softwareDirectory/AutoVerScheme/checkwindow.cpp +++ b/softwareDirectory/AutoVerScheme/checkwindow.cpp @@ -9,12 +9,17 @@ ui(new Ui::CheckWindow) { ui->setupUi(this); - ui->tableWidgetDevice->setColumnCount(8); - ui->tableWidgetMethod->setColumnCount(7); + //ui->tableWidgetDevice->setColumnCount(8); + //ui->tableWidgetMethod->setColumnCount(7); + ui->tableWidgetDevice->verticalHeader()->setParent(nullptr); for(int i=2;i<8;i++) ui->tableWidgetDevice->horizontalHeader()->setSectionResizeMode(i,QHeaderView::Stretch); - for(int i=2;i<7;i++) + ui->tableWidgetMethod->verticalHeader()->setParent(nullptr); //隐藏行头 + for(int i=1;i<5;i++) ui->tableWidgetMethod->horizontalHeader()->setSectionResizeMode(i,QHeaderView::Stretch); + ui->tableWidgetMethod->setColumnWidth(0, 60); + ui->tableWidgetMethod->setColumnWidth(5, 100); + ui->tableWidget_3->verticalHeader()->setParent(nullptr); for(int i=0;i<2;i++) ui->tableWidget_3->horizontalHeader()->setSectionResizeMode(i,QHeaderView::Stretch); getCheckDevice(); @@ -24,12 +29,15 @@ CheckWindow::~CheckWindow() { + myTaskList.clear(); + programList.clear(); delete ui; } void CheckWindow::showMethod() { ui->stackedWidget->setCurrentIndex(1); + getCheckMethod(); } void CheckWindow::showDevice() @@ -46,6 +54,7 @@ { ui->stackedWidget_2->setCurrentIndex(0); ui->stackedWidget->setCurrentIndex(0); + getCheckDevice(); } void CheckWindow::showResult() @@ -57,18 +66,17 @@ void CheckWindow::getCheckDevice() { - - BaseCommonApi dbManager; - // 调用数据库管理器的函数获取数据 - + myTaskList.clear(); + ui->tableWidgetDevice->clearContents(); + ui->tableWidgetDevice->setRowCount(0); //模拟用户ID - QString userId="1640229293790650370"; - QList data = BaseCommonApi::getMyTasks(userId,"3"); + QString userId="1695282436182188034"; + myTaskList = BaseCommonApi::getMyTasks(userId,"3"); int rowCount = 0; int row=0; QString State; - for (const MyTask& myTask : data) { + for (const MyTask& myTask : myTaskList) { rowCount = ui->tableWidgetDevice->rowCount(); ui->tableWidgetDevice->insertRow(rowCount); @@ -87,3 +95,49 @@ row++; } } + +void CheckWindow::getCheckMethod() +{ + programList.clear(); + ui->tableWidgetMethod->clearContents(); + ui->tableWidgetMethod->setRowCount(0); + programList = BaseCommonApi::getVerificationProgramInfoMain(); + int rowCount = 0; + int row=0; + for (const VerificationProgramInfo& program : programList) { + rowCount = ui->tableWidgetMethod->rowCount(); + + ui->tableWidgetMethod->insertRow(rowCount); + QTableWidgetItem* p_check = new QTableWidgetItem(); + p_check->setCheckState(Qt::Unchecked); //设置首列为 CheckBox 控件 + ui->tableWidgetMethod->setItem(row,0,p_check); + ui->tableWidgetMethod->setItem(row, 1, new QTableWidgetItem(program.program_name)); //设置数据 + ui->tableWidgetMethod->setItem(row, 2, new QTableWidgetItem(program.create_name)); //设置数据 + ui->tableWidgetMethod->setItem(row, 3, new QTableWidgetItem(program.create_time.toString())); //设置数据 + ui->tableWidgetMethod->setItem(row, 4, new QTableWidgetItem(program.remark)); //设置数据 + + QPushButton *btn_1 = new QPushButton(); + btn_1->setText(tr("详情")); + btn_1->setStyleSheet("QPushButton{" + "background-color:rgba(255,255,255,0);" + "color:rgba(0,0,255,100);" + "text-decoration:underline;" + "}"); + btn_1->setCursor(Qt::PointingHandCursor); + connect(btn_1,SIGNAL(clicked()),this,SLOT(on_editButton_clicked())); + + btn_1->setIconSize(QSize(16,16)); + btn_1->setIcon(QIcon(":/image/Index/u2324.svg")); + QWidget *tmp_widget = new QWidget(); + QHBoxLayout *tmp_layout = new QHBoxLayout(tmp_widget); + tmp_layout->addWidget(btn_1); + tmp_layout->setMargin(0); + ui->tableWidgetMethod->setCellWidget(row,5,tmp_widget); + row++; + } +} + +void CheckWindow::on_editButton_clicked() +{ + +} diff --git a/softwareDirectory/AutoVerScheme/checkwindow.h b/softwareDirectory/AutoVerScheme/checkwindow.h index 005a85a..ea27646 100644 --- a/softwareDirectory/AutoVerScheme/checkwindow.h +++ b/softwareDirectory/AutoVerScheme/checkwindow.h @@ -2,6 +2,7 @@ #define CHECKWINDOW_H #include +#include "basecommonapi.h" namespace Ui { class CheckWindow; @@ -20,10 +21,14 @@ void showCheck(); void showMethodWidget(); void showResult(); + void on_editButton_clicked(); private: void getCheckDevice(); + void getCheckMethod(); private: Ui::CheckWindow *ui; + QList programList; + QList myTaskList; }; #endif // CHECKWINDOW_H diff --git a/softwareDirectory/AutoVerScheme/checkwindow.ui b/softwareDirectory/AutoVerScheme/checkwindow.ui index 20fbb81..1f7ef8c 100644 --- a/softwareDirectory/AutoVerScheme/checkwindow.ui +++ b/softwareDirectory/AutoVerScheme/checkwindow.ui @@ -598,11 +598,6 @@ - 序号 - - - - 检定程序名称 diff --git a/softwareDirectory/AutoVerScheme/AutoVerScheme.pro b/softwareDirectory/AutoVerScheme/AutoVerScheme.pro index 7864245..b84a377 100644 --- a/softwareDirectory/AutoVerScheme/AutoVerScheme.pro +++ b/softwareDirectory/AutoVerScheme/AutoVerScheme.pro @@ -31,7 +31,9 @@ depar_task.cpp \ depar_task_server.cpp \ dialogcheckresult.cpp \ + formaddrsetting.cpp \ formcheckpoint.cpp \ + formcommsetting.cpp \ formverypoint.cpp \ indexwindow.cpp \ infomanageview.cpp \ @@ -53,6 +55,8 @@ wordengine.cpp HEADERS += \ + formaddrsetting.h \ + formcommsetting.h \ id/IdWorker.h \ id/Noncopyable.h \ id/Singleton.h \ @@ -102,7 +106,9 @@ datasyncview.ui \ depar_task.ui \ dialogcheckresult.ui \ + formaddrsetting.ui \ formcheckpoint.ui \ + formcommsetting.ui \ formverypoint.ui \ indexwindow.ui \ infomanageview.ui \ diff --git a/softwareDirectory/AutoVerScheme/AutoVerScheme.pro.user b/softwareDirectory/AutoVerScheme/AutoVerScheme.pro.user new file mode 100644 index 0000000..2ced4d3 --- /dev/null +++ b/softwareDirectory/AutoVerScheme/AutoVerScheme.pro.user @@ -0,0 +1,562 @@ + + + + + + EnvironmentId + {2746248a-b112-4e0f-9ae0-9e61f2a42309} + + + ProjectExplorer.Project.ActiveTarget + 0 + + + ProjectExplorer.Project.EditorSettings + + true + false + true + + Cpp + + CppGlobal + + + + QmlJS + + QmlJSGlobal + + + 2 + UTF-8 + false + 4 + false + 80 + true + true + 1 + true + false + 0 + true + true + 0 + 8 + true + 1 + true + true + true + false + + + + ProjectExplorer.Project.PluginSettings + + + -fno-delayed-template-parsing + + true + + + + ProjectExplorer.Project.Target.0 + + Desktop Qt 5.14.2 MinGW 64-bit + Desktop Qt 5.14.2 MinGW 64-bit + qt.qt5.5142.win64_mingw73_kit + 0 + 0 + 0 + + D:/dev/software/softwareDirectory/build-AutoVerScheme-Desktop_Qt_5_14_2_MinGW_64_bit-Debug + + + true + QtProjectManager.QMakeBuildStep + true + + false + false + false + + + true + Qt4ProjectManager.MakeStep + + false + + + false + + 2 + Build + Build + ProjectExplorer.BuildSteps.Build + + + + true + Qt4ProjectManager.MakeStep + + true + clean + + false + + 1 + Clean + Clean + ProjectExplorer.BuildSteps.Clean + + 2 + false + + Debug + Qt4ProjectManager.Qt4BuildConfiguration + 2 + + + D:/dev/software/softwareDirectory/build-AutoVerScheme-Desktop_Qt_5_14_2_MinGW_64_bit-Release + + + true + QtProjectManager.QMakeBuildStep + false + + false + false + true + + + true + Qt4ProjectManager.MakeStep + + false + + + false + + 2 + Build + Build + ProjectExplorer.BuildSteps.Build + + + + true + Qt4ProjectManager.MakeStep + + true + clean + + false + + 1 + Clean + Clean + ProjectExplorer.BuildSteps.Clean + + 2 + false + + Release + Qt4ProjectManager.Qt4BuildConfiguration + 0 + + + D:/dev/software/softwareDirectory/build-AutoVerScheme-Desktop_Qt_5_14_2_MinGW_64_bit-Profile + + + true + QtProjectManager.QMakeBuildStep + true + + false + true + true + + + true + Qt4ProjectManager.MakeStep + + false + + + false + + 2 + Build + Build + ProjectExplorer.BuildSteps.Build + + + + true + Qt4ProjectManager.MakeStep + + true + clean + + false + + 1 + Clean + Clean + ProjectExplorer.BuildSteps.Clean + + 2 + false + + Profile + Qt4ProjectManager.Qt4BuildConfiguration + 0 + + 3 + + + 0 + Deploy + Deploy + ProjectExplorer.BuildSteps.Deploy + + 1 + ProjectExplorer.DefaultDeployConfiguration + + 1 + + + dwarf + + cpu-cycles + + + 250 + + -e + cpu-cycles + --call-graph + dwarf,4096 + -F + 250 + + -F + true + 4096 + false + false + 1000 + + true + + false + false + false + false + true + 0.01 + 10 + true + kcachegrind + 1 + 25 + + 1 + true + false + true + valgrind + + 0 + 1 + 2 + 3 + 4 + 5 + 6 + 7 + 8 + 9 + 10 + 11 + 12 + 13 + 14 + + 2 + + Qt4ProjectManager.Qt4RunConfiguration:D:/dev/software/softwareDirectory/AutoVerScheme/AutoVerScheme.pro + D:/dev/software/softwareDirectory/AutoVerScheme/AutoVerScheme.pro + + false + + false + true + true + false + false + true + + D:/dev/software/softwareDirectory/build-AutoVerScheme-Desktop_Qt_5_14_2_MinGW_64_bit-Debug + + 1 + + + + ProjectExplorer.Project.Target.1 + + Desktop Qt 5.14.2 MinGW 32-bit + Desktop Qt 5.14.2 MinGW 32-bit + qt.qt5.5142.win32_mingw73_kit + 0 + 0 + 0 + + D:/dev/software/softwareDirectory/build-AutoVerScheme-Desktop_Qt_5_14_2_MinGW_32_bit-Debug + + + true + QtProjectManager.QMakeBuildStep + true + + false + false + false + + + true + Qt4ProjectManager.MakeStep + + false + + + false + + 2 + Build + Build + ProjectExplorer.BuildSteps.Build + + + + true + Qt4ProjectManager.MakeStep + + true + clean + + false + + 1 + Clean + Clean + ProjectExplorer.BuildSteps.Clean + + 2 + false + + Debug + Qt4ProjectManager.Qt4BuildConfiguration + 2 + + + D:/dev/software/softwareDirectory/build-AutoVerScheme-Desktop_Qt_5_14_2_MinGW_32_bit-Release + + + true + QtProjectManager.QMakeBuildStep + false + + false + false + true + + + true + Qt4ProjectManager.MakeStep + + false + + + false + + 2 + Build + Build + ProjectExplorer.BuildSteps.Build + + + + true + Qt4ProjectManager.MakeStep + + true + clean + + false + + 1 + Clean + Clean + ProjectExplorer.BuildSteps.Clean + + 2 + false + + Release + Qt4ProjectManager.Qt4BuildConfiguration + 0 + + + D:/dev/software/softwareDirectory/build-AutoVerScheme-Desktop_Qt_5_14_2_MinGW_32_bit-Profile + + + true + QtProjectManager.QMakeBuildStep + true + + false + true + true + + + true + Qt4ProjectManager.MakeStep + + false + + + false + + 2 + Build + Build + ProjectExplorer.BuildSteps.Build + + + + true + Qt4ProjectManager.MakeStep + + true + clean + + false + + 1 + Clean + Clean + ProjectExplorer.BuildSteps.Clean + + 2 + false + + Profile + Qt4ProjectManager.Qt4BuildConfiguration + 0 + + 3 + + + 0 + Deploy + Deploy + ProjectExplorer.BuildSteps.Deploy + + 1 + ProjectExplorer.DefaultDeployConfiguration + + 1 + + + dwarf + + cpu-cycles + + + 250 + + -e + cpu-cycles + --call-graph + dwarf,4096 + -F + 250 + + -F + true + 4096 + false + false + 1000 + + true + + false + false + false + false + true + 0.01 + 10 + true + kcachegrind + 1 + 25 + + 1 + true + false + true + valgrind + + 0 + 1 + 2 + 3 + 4 + 5 + 6 + 7 + 8 + 9 + 10 + 11 + 12 + 13 + 14 + + 2 + + Qt4ProjectManager.Qt4RunConfiguration:D:/dev/software/softwareDirectory/AutoVerScheme/AutoVerScheme.pro + D:/dev/software/softwareDirectory/AutoVerScheme/AutoVerScheme.pro + + false + + false + true + true + false + false + true + + + + 1 + + + + ProjectExplorer.Project.TargetCount + 2 + + + ProjectExplorer.Project.Updater.FileVersion + 22 + + + Version + 22 + + diff --git a/softwareDirectory/AutoVerScheme/checkmethodmanage.ui b/softwareDirectory/AutoVerScheme/checkmethodmanage.ui index 648509b..da56d61 100644 --- a/softwareDirectory/AutoVerScheme/checkmethodmanage.ui +++ b/softwareDirectory/AutoVerScheme/checkmethodmanage.ui @@ -123,8 +123,7 @@ color: rgb(255, 255, 255); background-color: rgb(74, 102, 186); -border-radius:5px; -padding:10px 20px; +border-radius:5px; 查询 diff --git a/softwareDirectory/AutoVerScheme/checkwindow.cpp b/softwareDirectory/AutoVerScheme/checkwindow.cpp index 51650f9..da86ad4 100644 --- a/softwareDirectory/AutoVerScheme/checkwindow.cpp +++ b/softwareDirectory/AutoVerScheme/checkwindow.cpp @@ -9,12 +9,17 @@ ui(new Ui::CheckWindow) { ui->setupUi(this); - ui->tableWidgetDevice->setColumnCount(8); - ui->tableWidgetMethod->setColumnCount(7); + //ui->tableWidgetDevice->setColumnCount(8); + //ui->tableWidgetMethod->setColumnCount(7); + ui->tableWidgetDevice->verticalHeader()->setParent(nullptr); for(int i=2;i<8;i++) ui->tableWidgetDevice->horizontalHeader()->setSectionResizeMode(i,QHeaderView::Stretch); - for(int i=2;i<7;i++) + ui->tableWidgetMethod->verticalHeader()->setParent(nullptr); //隐藏行头 + for(int i=1;i<5;i++) ui->tableWidgetMethod->horizontalHeader()->setSectionResizeMode(i,QHeaderView::Stretch); + ui->tableWidgetMethod->setColumnWidth(0, 60); + ui->tableWidgetMethod->setColumnWidth(5, 100); + ui->tableWidget_3->verticalHeader()->setParent(nullptr); for(int i=0;i<2;i++) ui->tableWidget_3->horizontalHeader()->setSectionResizeMode(i,QHeaderView::Stretch); getCheckDevice(); @@ -24,12 +29,15 @@ CheckWindow::~CheckWindow() { + myTaskList.clear(); + programList.clear(); delete ui; } void CheckWindow::showMethod() { ui->stackedWidget->setCurrentIndex(1); + getCheckMethod(); } void CheckWindow::showDevice() @@ -46,6 +54,7 @@ { ui->stackedWidget_2->setCurrentIndex(0); ui->stackedWidget->setCurrentIndex(0); + getCheckDevice(); } void CheckWindow::showResult() @@ -57,18 +66,17 @@ void CheckWindow::getCheckDevice() { - - BaseCommonApi dbManager; - // 调用数据库管理器的函数获取数据 - + myTaskList.clear(); + ui->tableWidgetDevice->clearContents(); + ui->tableWidgetDevice->setRowCount(0); //模拟用户ID - QString userId="1640229293790650370"; - QList data = BaseCommonApi::getMyTasks(userId,"3"); + QString userId="1695282436182188034"; + myTaskList = BaseCommonApi::getMyTasks(userId,"3"); int rowCount = 0; int row=0; QString State; - for (const MyTask& myTask : data) { + for (const MyTask& myTask : myTaskList) { rowCount = ui->tableWidgetDevice->rowCount(); ui->tableWidgetDevice->insertRow(rowCount); @@ -87,3 +95,49 @@ row++; } } + +void CheckWindow::getCheckMethod() +{ + programList.clear(); + ui->tableWidgetMethod->clearContents(); + ui->tableWidgetMethod->setRowCount(0); + programList = BaseCommonApi::getVerificationProgramInfoMain(); + int rowCount = 0; + int row=0; + for (const VerificationProgramInfo& program : programList) { + rowCount = ui->tableWidgetMethod->rowCount(); + + ui->tableWidgetMethod->insertRow(rowCount); + QTableWidgetItem* p_check = new QTableWidgetItem(); + p_check->setCheckState(Qt::Unchecked); //设置首列为 CheckBox 控件 + ui->tableWidgetMethod->setItem(row,0,p_check); + ui->tableWidgetMethod->setItem(row, 1, new QTableWidgetItem(program.program_name)); //设置数据 + ui->tableWidgetMethod->setItem(row, 2, new QTableWidgetItem(program.create_name)); //设置数据 + ui->tableWidgetMethod->setItem(row, 3, new QTableWidgetItem(program.create_time.toString())); //设置数据 + ui->tableWidgetMethod->setItem(row, 4, new QTableWidgetItem(program.remark)); //设置数据 + + QPushButton *btn_1 = new QPushButton(); + btn_1->setText(tr("详情")); + btn_1->setStyleSheet("QPushButton{" + "background-color:rgba(255,255,255,0);" + "color:rgba(0,0,255,100);" + "text-decoration:underline;" + "}"); + btn_1->setCursor(Qt::PointingHandCursor); + connect(btn_1,SIGNAL(clicked()),this,SLOT(on_editButton_clicked())); + + btn_1->setIconSize(QSize(16,16)); + btn_1->setIcon(QIcon(":/image/Index/u2324.svg")); + QWidget *tmp_widget = new QWidget(); + QHBoxLayout *tmp_layout = new QHBoxLayout(tmp_widget); + tmp_layout->addWidget(btn_1); + tmp_layout->setMargin(0); + ui->tableWidgetMethod->setCellWidget(row,5,tmp_widget); + row++; + } +} + +void CheckWindow::on_editButton_clicked() +{ + +} diff --git a/softwareDirectory/AutoVerScheme/checkwindow.h b/softwareDirectory/AutoVerScheme/checkwindow.h index 005a85a..ea27646 100644 --- a/softwareDirectory/AutoVerScheme/checkwindow.h +++ b/softwareDirectory/AutoVerScheme/checkwindow.h @@ -2,6 +2,7 @@ #define CHECKWINDOW_H #include +#include "basecommonapi.h" namespace Ui { class CheckWindow; @@ -20,10 +21,14 @@ void showCheck(); void showMethodWidget(); void showResult(); + void on_editButton_clicked(); private: void getCheckDevice(); + void getCheckMethod(); private: Ui::CheckWindow *ui; + QList programList; + QList myTaskList; }; #endif // CHECKWINDOW_H diff --git a/softwareDirectory/AutoVerScheme/checkwindow.ui b/softwareDirectory/AutoVerScheme/checkwindow.ui index 20fbb81..1f7ef8c 100644 --- a/softwareDirectory/AutoVerScheme/checkwindow.ui +++ b/softwareDirectory/AutoVerScheme/checkwindow.ui @@ -598,11 +598,6 @@ - 序号 - - - - 检定程序名称 diff --git a/softwareDirectory/AutoVerScheme/formaddrsetting.cpp b/softwareDirectory/AutoVerScheme/formaddrsetting.cpp new file mode 100644 index 0000000..e0fb33a --- /dev/null +++ b/softwareDirectory/AutoVerScheme/formaddrsetting.cpp @@ -0,0 +1,14 @@ +#include "formaddrsetting.h" +#include "ui_formaddrsetting.h" + +FormAddrSetting::FormAddrSetting(QWidget *parent,int type,QString id) : + QWidget(parent), + ui(new Ui::FormAddrSetting) +{ + ui->setupUi(this); +} + +FormAddrSetting::~FormAddrSetting() +{ + delete ui; +} diff --git a/softwareDirectory/AutoVerScheme/AutoVerScheme.pro b/softwareDirectory/AutoVerScheme/AutoVerScheme.pro index 7864245..b84a377 100644 --- a/softwareDirectory/AutoVerScheme/AutoVerScheme.pro +++ b/softwareDirectory/AutoVerScheme/AutoVerScheme.pro @@ -31,7 +31,9 @@ depar_task.cpp \ depar_task_server.cpp \ dialogcheckresult.cpp \ + formaddrsetting.cpp \ formcheckpoint.cpp \ + formcommsetting.cpp \ formverypoint.cpp \ indexwindow.cpp \ infomanageview.cpp \ @@ -53,6 +55,8 @@ wordengine.cpp HEADERS += \ + formaddrsetting.h \ + formcommsetting.h \ id/IdWorker.h \ id/Noncopyable.h \ id/Singleton.h \ @@ -102,7 +106,9 @@ datasyncview.ui \ depar_task.ui \ dialogcheckresult.ui \ + formaddrsetting.ui \ formcheckpoint.ui \ + formcommsetting.ui \ formverypoint.ui \ indexwindow.ui \ infomanageview.ui \ diff --git a/softwareDirectory/AutoVerScheme/AutoVerScheme.pro.user b/softwareDirectory/AutoVerScheme/AutoVerScheme.pro.user new file mode 100644 index 0000000..2ced4d3 --- /dev/null +++ b/softwareDirectory/AutoVerScheme/AutoVerScheme.pro.user @@ -0,0 +1,562 @@ + + + + + + EnvironmentId + {2746248a-b112-4e0f-9ae0-9e61f2a42309} + + + ProjectExplorer.Project.ActiveTarget + 0 + + + ProjectExplorer.Project.EditorSettings + + true + false + true + + Cpp + + CppGlobal + + + + QmlJS + + QmlJSGlobal + + + 2 + UTF-8 + false + 4 + false + 80 + true + true + 1 + true + false + 0 + true + true + 0 + 8 + true + 1 + true + true + true + false + + + + ProjectExplorer.Project.PluginSettings + + + -fno-delayed-template-parsing + + true + + + + ProjectExplorer.Project.Target.0 + + Desktop Qt 5.14.2 MinGW 64-bit + Desktop Qt 5.14.2 MinGW 64-bit + qt.qt5.5142.win64_mingw73_kit + 0 + 0 + 0 + + D:/dev/software/softwareDirectory/build-AutoVerScheme-Desktop_Qt_5_14_2_MinGW_64_bit-Debug + + + true + QtProjectManager.QMakeBuildStep + true + + false + false + false + + + true + Qt4ProjectManager.MakeStep + + false + + + false + + 2 + Build + Build + ProjectExplorer.BuildSteps.Build + + + + true + Qt4ProjectManager.MakeStep + + true + clean + + false + + 1 + Clean + Clean + ProjectExplorer.BuildSteps.Clean + + 2 + false + + Debug + Qt4ProjectManager.Qt4BuildConfiguration + 2 + + + D:/dev/software/softwareDirectory/build-AutoVerScheme-Desktop_Qt_5_14_2_MinGW_64_bit-Release + + + true + QtProjectManager.QMakeBuildStep + false + + false + false + true + + + true + Qt4ProjectManager.MakeStep + + false + + + false + + 2 + Build + Build + ProjectExplorer.BuildSteps.Build + + + + true + Qt4ProjectManager.MakeStep + + true + clean + + false + + 1 + Clean + Clean + ProjectExplorer.BuildSteps.Clean + + 2 + false + + Release + Qt4ProjectManager.Qt4BuildConfiguration + 0 + + + D:/dev/software/softwareDirectory/build-AutoVerScheme-Desktop_Qt_5_14_2_MinGW_64_bit-Profile + + + true + QtProjectManager.QMakeBuildStep + true + + false + true + true + + + true + Qt4ProjectManager.MakeStep + + false + + + false + + 2 + Build + Build + ProjectExplorer.BuildSteps.Build + + + + true + Qt4ProjectManager.MakeStep + + true + clean + + false + + 1 + Clean + Clean + ProjectExplorer.BuildSteps.Clean + + 2 + false + + Profile + Qt4ProjectManager.Qt4BuildConfiguration + 0 + + 3 + + + 0 + Deploy + Deploy + ProjectExplorer.BuildSteps.Deploy + + 1 + ProjectExplorer.DefaultDeployConfiguration + + 1 + + + dwarf + + cpu-cycles + + + 250 + + -e + cpu-cycles + --call-graph + dwarf,4096 + -F + 250 + + -F + true + 4096 + false + false + 1000 + + true + + false + false + false + false + true + 0.01 + 10 + true + kcachegrind + 1 + 25 + + 1 + true + false + true + valgrind + + 0 + 1 + 2 + 3 + 4 + 5 + 6 + 7 + 8 + 9 + 10 + 11 + 12 + 13 + 14 + + 2 + + Qt4ProjectManager.Qt4RunConfiguration:D:/dev/software/softwareDirectory/AutoVerScheme/AutoVerScheme.pro + D:/dev/software/softwareDirectory/AutoVerScheme/AutoVerScheme.pro + + false + + false + true + true + false + false + true + + D:/dev/software/softwareDirectory/build-AutoVerScheme-Desktop_Qt_5_14_2_MinGW_64_bit-Debug + + 1 + + + + ProjectExplorer.Project.Target.1 + + Desktop Qt 5.14.2 MinGW 32-bit + Desktop Qt 5.14.2 MinGW 32-bit + qt.qt5.5142.win32_mingw73_kit + 0 + 0 + 0 + + D:/dev/software/softwareDirectory/build-AutoVerScheme-Desktop_Qt_5_14_2_MinGW_32_bit-Debug + + + true + QtProjectManager.QMakeBuildStep + true + + false + false + false + + + true + Qt4ProjectManager.MakeStep + + false + + + false + + 2 + Build + Build + ProjectExplorer.BuildSteps.Build + + + + true + Qt4ProjectManager.MakeStep + + true + clean + + false + + 1 + Clean + Clean + ProjectExplorer.BuildSteps.Clean + + 2 + false + + Debug + Qt4ProjectManager.Qt4BuildConfiguration + 2 + + + D:/dev/software/softwareDirectory/build-AutoVerScheme-Desktop_Qt_5_14_2_MinGW_32_bit-Release + + + true + QtProjectManager.QMakeBuildStep + false + + false + false + true + + + true + Qt4ProjectManager.MakeStep + + false + + + false + + 2 + Build + Build + ProjectExplorer.BuildSteps.Build + + + + true + Qt4ProjectManager.MakeStep + + true + clean + + false + + 1 + Clean + Clean + ProjectExplorer.BuildSteps.Clean + + 2 + false + + Release + Qt4ProjectManager.Qt4BuildConfiguration + 0 + + + D:/dev/software/softwareDirectory/build-AutoVerScheme-Desktop_Qt_5_14_2_MinGW_32_bit-Profile + + + true + QtProjectManager.QMakeBuildStep + true + + false + true + true + + + true + Qt4ProjectManager.MakeStep + + false + + + false + + 2 + Build + Build + ProjectExplorer.BuildSteps.Build + + + + true + Qt4ProjectManager.MakeStep + + true + clean + + false + + 1 + Clean + Clean + ProjectExplorer.BuildSteps.Clean + + 2 + false + + Profile + Qt4ProjectManager.Qt4BuildConfiguration + 0 + + 3 + + + 0 + Deploy + Deploy + ProjectExplorer.BuildSteps.Deploy + + 1 + ProjectExplorer.DefaultDeployConfiguration + + 1 + + + dwarf + + cpu-cycles + + + 250 + + -e + cpu-cycles + --call-graph + dwarf,4096 + -F + 250 + + -F + true + 4096 + false + false + 1000 + + true + + false + false + false + false + true + 0.01 + 10 + true + kcachegrind + 1 + 25 + + 1 + true + false + true + valgrind + + 0 + 1 + 2 + 3 + 4 + 5 + 6 + 7 + 8 + 9 + 10 + 11 + 12 + 13 + 14 + + 2 + + Qt4ProjectManager.Qt4RunConfiguration:D:/dev/software/softwareDirectory/AutoVerScheme/AutoVerScheme.pro + D:/dev/software/softwareDirectory/AutoVerScheme/AutoVerScheme.pro + + false + + false + true + true + false + false + true + + + + 1 + + + + ProjectExplorer.Project.TargetCount + 2 + + + ProjectExplorer.Project.Updater.FileVersion + 22 + + + Version + 22 + + diff --git a/softwareDirectory/AutoVerScheme/checkmethodmanage.ui b/softwareDirectory/AutoVerScheme/checkmethodmanage.ui index 648509b..da56d61 100644 --- a/softwareDirectory/AutoVerScheme/checkmethodmanage.ui +++ b/softwareDirectory/AutoVerScheme/checkmethodmanage.ui @@ -123,8 +123,7 @@ color: rgb(255, 255, 255); background-color: rgb(74, 102, 186); -border-radius:5px; -padding:10px 20px; +border-radius:5px; 查询 diff --git a/softwareDirectory/AutoVerScheme/checkwindow.cpp b/softwareDirectory/AutoVerScheme/checkwindow.cpp index 51650f9..da86ad4 100644 --- a/softwareDirectory/AutoVerScheme/checkwindow.cpp +++ b/softwareDirectory/AutoVerScheme/checkwindow.cpp @@ -9,12 +9,17 @@ ui(new Ui::CheckWindow) { ui->setupUi(this); - ui->tableWidgetDevice->setColumnCount(8); - ui->tableWidgetMethod->setColumnCount(7); + //ui->tableWidgetDevice->setColumnCount(8); + //ui->tableWidgetMethod->setColumnCount(7); + ui->tableWidgetDevice->verticalHeader()->setParent(nullptr); for(int i=2;i<8;i++) ui->tableWidgetDevice->horizontalHeader()->setSectionResizeMode(i,QHeaderView::Stretch); - for(int i=2;i<7;i++) + ui->tableWidgetMethod->verticalHeader()->setParent(nullptr); //隐藏行头 + for(int i=1;i<5;i++) ui->tableWidgetMethod->horizontalHeader()->setSectionResizeMode(i,QHeaderView::Stretch); + ui->tableWidgetMethod->setColumnWidth(0, 60); + ui->tableWidgetMethod->setColumnWidth(5, 100); + ui->tableWidget_3->verticalHeader()->setParent(nullptr); for(int i=0;i<2;i++) ui->tableWidget_3->horizontalHeader()->setSectionResizeMode(i,QHeaderView::Stretch); getCheckDevice(); @@ -24,12 +29,15 @@ CheckWindow::~CheckWindow() { + myTaskList.clear(); + programList.clear(); delete ui; } void CheckWindow::showMethod() { ui->stackedWidget->setCurrentIndex(1); + getCheckMethod(); } void CheckWindow::showDevice() @@ -46,6 +54,7 @@ { ui->stackedWidget_2->setCurrentIndex(0); ui->stackedWidget->setCurrentIndex(0); + getCheckDevice(); } void CheckWindow::showResult() @@ -57,18 +66,17 @@ void CheckWindow::getCheckDevice() { - - BaseCommonApi dbManager; - // 调用数据库管理器的函数获取数据 - + myTaskList.clear(); + ui->tableWidgetDevice->clearContents(); + ui->tableWidgetDevice->setRowCount(0); //模拟用户ID - QString userId="1640229293790650370"; - QList data = BaseCommonApi::getMyTasks(userId,"3"); + QString userId="1695282436182188034"; + myTaskList = BaseCommonApi::getMyTasks(userId,"3"); int rowCount = 0; int row=0; QString State; - for (const MyTask& myTask : data) { + for (const MyTask& myTask : myTaskList) { rowCount = ui->tableWidgetDevice->rowCount(); ui->tableWidgetDevice->insertRow(rowCount); @@ -87,3 +95,49 @@ row++; } } + +void CheckWindow::getCheckMethod() +{ + programList.clear(); + ui->tableWidgetMethod->clearContents(); + ui->tableWidgetMethod->setRowCount(0); + programList = BaseCommonApi::getVerificationProgramInfoMain(); + int rowCount = 0; + int row=0; + for (const VerificationProgramInfo& program : programList) { + rowCount = ui->tableWidgetMethod->rowCount(); + + ui->tableWidgetMethod->insertRow(rowCount); + QTableWidgetItem* p_check = new QTableWidgetItem(); + p_check->setCheckState(Qt::Unchecked); //设置首列为 CheckBox 控件 + ui->tableWidgetMethod->setItem(row,0,p_check); + ui->tableWidgetMethod->setItem(row, 1, new QTableWidgetItem(program.program_name)); //设置数据 + ui->tableWidgetMethod->setItem(row, 2, new QTableWidgetItem(program.create_name)); //设置数据 + ui->tableWidgetMethod->setItem(row, 3, new QTableWidgetItem(program.create_time.toString())); //设置数据 + ui->tableWidgetMethod->setItem(row, 4, new QTableWidgetItem(program.remark)); //设置数据 + + QPushButton *btn_1 = new QPushButton(); + btn_1->setText(tr("详情")); + btn_1->setStyleSheet("QPushButton{" + "background-color:rgba(255,255,255,0);" + "color:rgba(0,0,255,100);" + "text-decoration:underline;" + "}"); + btn_1->setCursor(Qt::PointingHandCursor); + connect(btn_1,SIGNAL(clicked()),this,SLOT(on_editButton_clicked())); + + btn_1->setIconSize(QSize(16,16)); + btn_1->setIcon(QIcon(":/image/Index/u2324.svg")); + QWidget *tmp_widget = new QWidget(); + QHBoxLayout *tmp_layout = new QHBoxLayout(tmp_widget); + tmp_layout->addWidget(btn_1); + tmp_layout->setMargin(0); + ui->tableWidgetMethod->setCellWidget(row,5,tmp_widget); + row++; + } +} + +void CheckWindow::on_editButton_clicked() +{ + +} diff --git a/softwareDirectory/AutoVerScheme/checkwindow.h b/softwareDirectory/AutoVerScheme/checkwindow.h index 005a85a..ea27646 100644 --- a/softwareDirectory/AutoVerScheme/checkwindow.h +++ b/softwareDirectory/AutoVerScheme/checkwindow.h @@ -2,6 +2,7 @@ #define CHECKWINDOW_H #include +#include "basecommonapi.h" namespace Ui { class CheckWindow; @@ -20,10 +21,14 @@ void showCheck(); void showMethodWidget(); void showResult(); + void on_editButton_clicked(); private: void getCheckDevice(); + void getCheckMethod(); private: Ui::CheckWindow *ui; + QList programList; + QList myTaskList; }; #endif // CHECKWINDOW_H diff --git a/softwareDirectory/AutoVerScheme/checkwindow.ui b/softwareDirectory/AutoVerScheme/checkwindow.ui index 20fbb81..1f7ef8c 100644 --- a/softwareDirectory/AutoVerScheme/checkwindow.ui +++ b/softwareDirectory/AutoVerScheme/checkwindow.ui @@ -598,11 +598,6 @@ - 序号 - - - - 检定程序名称 diff --git a/softwareDirectory/AutoVerScheme/formaddrsetting.cpp b/softwareDirectory/AutoVerScheme/formaddrsetting.cpp new file mode 100644 index 0000000..e0fb33a --- /dev/null +++ b/softwareDirectory/AutoVerScheme/formaddrsetting.cpp @@ -0,0 +1,14 @@ +#include "formaddrsetting.h" +#include "ui_formaddrsetting.h" + +FormAddrSetting::FormAddrSetting(QWidget *parent,int type,QString id) : + QWidget(parent), + ui(new Ui::FormAddrSetting) +{ + ui->setupUi(this); +} + +FormAddrSetting::~FormAddrSetting() +{ + delete ui; +} diff --git a/softwareDirectory/AutoVerScheme/formaddrsetting.h b/softwareDirectory/AutoVerScheme/formaddrsetting.h new file mode 100644 index 0000000..6392d44 --- /dev/null +++ b/softwareDirectory/AutoVerScheme/formaddrsetting.h @@ -0,0 +1,22 @@ +#ifndef FORMADDRSETTING_H +#define FORMADDRSETTING_H + +#include + +namespace Ui { +class FormAddrSetting; +} + +class FormAddrSetting : public QWidget +{ + Q_OBJECT + +public: + explicit FormAddrSetting(QWidget *parent = nullptr,int type=1,QString id=""); + ~FormAddrSetting(); + +private: + Ui::FormAddrSetting *ui; +}; + +#endif // FORMADDRSETTING_H diff --git a/softwareDirectory/AutoVerScheme/AutoVerScheme.pro b/softwareDirectory/AutoVerScheme/AutoVerScheme.pro index 7864245..b84a377 100644 --- a/softwareDirectory/AutoVerScheme/AutoVerScheme.pro +++ b/softwareDirectory/AutoVerScheme/AutoVerScheme.pro @@ -31,7 +31,9 @@ depar_task.cpp \ depar_task_server.cpp \ dialogcheckresult.cpp \ + formaddrsetting.cpp \ formcheckpoint.cpp \ + formcommsetting.cpp \ formverypoint.cpp \ indexwindow.cpp \ infomanageview.cpp \ @@ -53,6 +55,8 @@ wordengine.cpp HEADERS += \ + formaddrsetting.h \ + formcommsetting.h \ id/IdWorker.h \ id/Noncopyable.h \ id/Singleton.h \ @@ -102,7 +106,9 @@ datasyncview.ui \ depar_task.ui \ dialogcheckresult.ui \ + formaddrsetting.ui \ formcheckpoint.ui \ + formcommsetting.ui \ formverypoint.ui \ indexwindow.ui \ infomanageview.ui \ diff --git a/softwareDirectory/AutoVerScheme/AutoVerScheme.pro.user b/softwareDirectory/AutoVerScheme/AutoVerScheme.pro.user new file mode 100644 index 0000000..2ced4d3 --- /dev/null +++ b/softwareDirectory/AutoVerScheme/AutoVerScheme.pro.user @@ -0,0 +1,562 @@ + + + + + + EnvironmentId + {2746248a-b112-4e0f-9ae0-9e61f2a42309} + + + ProjectExplorer.Project.ActiveTarget + 0 + + + ProjectExplorer.Project.EditorSettings + + true + false + true + + Cpp + + CppGlobal + + + + QmlJS + + QmlJSGlobal + + + 2 + UTF-8 + false + 4 + false + 80 + true + true + 1 + true + false + 0 + true + true + 0 + 8 + true + 1 + true + true + true + false + + + + ProjectExplorer.Project.PluginSettings + + + -fno-delayed-template-parsing + + true + + + + ProjectExplorer.Project.Target.0 + + Desktop Qt 5.14.2 MinGW 64-bit + Desktop Qt 5.14.2 MinGW 64-bit + qt.qt5.5142.win64_mingw73_kit + 0 + 0 + 0 + + D:/dev/software/softwareDirectory/build-AutoVerScheme-Desktop_Qt_5_14_2_MinGW_64_bit-Debug + + + true + QtProjectManager.QMakeBuildStep + true + + false + false + false + + + true + Qt4ProjectManager.MakeStep + + false + + + false + + 2 + Build + Build + ProjectExplorer.BuildSteps.Build + + + + true + Qt4ProjectManager.MakeStep + + true + clean + + false + + 1 + Clean + Clean + ProjectExplorer.BuildSteps.Clean + + 2 + false + + Debug + Qt4ProjectManager.Qt4BuildConfiguration + 2 + + + D:/dev/software/softwareDirectory/build-AutoVerScheme-Desktop_Qt_5_14_2_MinGW_64_bit-Release + + + true + QtProjectManager.QMakeBuildStep + false + + false + false + true + + + true + Qt4ProjectManager.MakeStep + + false + + + false + + 2 + Build + Build + ProjectExplorer.BuildSteps.Build + + + + true + Qt4ProjectManager.MakeStep + + true + clean + + false + + 1 + Clean + Clean + ProjectExplorer.BuildSteps.Clean + + 2 + false + + Release + Qt4ProjectManager.Qt4BuildConfiguration + 0 + + + D:/dev/software/softwareDirectory/build-AutoVerScheme-Desktop_Qt_5_14_2_MinGW_64_bit-Profile + + + true + QtProjectManager.QMakeBuildStep + true + + false + true + true + + + true + Qt4ProjectManager.MakeStep + + false + + + false + + 2 + Build + Build + ProjectExplorer.BuildSteps.Build + + + + true + Qt4ProjectManager.MakeStep + + true + clean + + false + + 1 + Clean + Clean + ProjectExplorer.BuildSteps.Clean + + 2 + false + + Profile + Qt4ProjectManager.Qt4BuildConfiguration + 0 + + 3 + + + 0 + Deploy + Deploy + ProjectExplorer.BuildSteps.Deploy + + 1 + ProjectExplorer.DefaultDeployConfiguration + + 1 + + + dwarf + + cpu-cycles + + + 250 + + -e + cpu-cycles + --call-graph + dwarf,4096 + -F + 250 + + -F + true + 4096 + false + false + 1000 + + true + + false + false + false + false + true + 0.01 + 10 + true + kcachegrind + 1 + 25 + + 1 + true + false + true + valgrind + + 0 + 1 + 2 + 3 + 4 + 5 + 6 + 7 + 8 + 9 + 10 + 11 + 12 + 13 + 14 + + 2 + + Qt4ProjectManager.Qt4RunConfiguration:D:/dev/software/softwareDirectory/AutoVerScheme/AutoVerScheme.pro + D:/dev/software/softwareDirectory/AutoVerScheme/AutoVerScheme.pro + + false + + false + true + true + false + false + true + + D:/dev/software/softwareDirectory/build-AutoVerScheme-Desktop_Qt_5_14_2_MinGW_64_bit-Debug + + 1 + + + + ProjectExplorer.Project.Target.1 + + Desktop Qt 5.14.2 MinGW 32-bit + Desktop Qt 5.14.2 MinGW 32-bit + qt.qt5.5142.win32_mingw73_kit + 0 + 0 + 0 + + D:/dev/software/softwareDirectory/build-AutoVerScheme-Desktop_Qt_5_14_2_MinGW_32_bit-Debug + + + true + QtProjectManager.QMakeBuildStep + true + + false + false + false + + + true + Qt4ProjectManager.MakeStep + + false + + + false + + 2 + Build + Build + ProjectExplorer.BuildSteps.Build + + + + true + Qt4ProjectManager.MakeStep + + true + clean + + false + + 1 + Clean + Clean + ProjectExplorer.BuildSteps.Clean + + 2 + false + + Debug + Qt4ProjectManager.Qt4BuildConfiguration + 2 + + + D:/dev/software/softwareDirectory/build-AutoVerScheme-Desktop_Qt_5_14_2_MinGW_32_bit-Release + + + true + QtProjectManager.QMakeBuildStep + false + + false + false + true + + + true + Qt4ProjectManager.MakeStep + + false + + + false + + 2 + Build + Build + ProjectExplorer.BuildSteps.Build + + + + true + Qt4ProjectManager.MakeStep + + true + clean + + false + + 1 + Clean + Clean + ProjectExplorer.BuildSteps.Clean + + 2 + false + + Release + Qt4ProjectManager.Qt4BuildConfiguration + 0 + + + D:/dev/software/softwareDirectory/build-AutoVerScheme-Desktop_Qt_5_14_2_MinGW_32_bit-Profile + + + true + QtProjectManager.QMakeBuildStep + true + + false + true + true + + + true + Qt4ProjectManager.MakeStep + + false + + + false + + 2 + Build + Build + ProjectExplorer.BuildSteps.Build + + + + true + Qt4ProjectManager.MakeStep + + true + clean + + false + + 1 + Clean + Clean + ProjectExplorer.BuildSteps.Clean + + 2 + false + + Profile + Qt4ProjectManager.Qt4BuildConfiguration + 0 + + 3 + + + 0 + Deploy + Deploy + ProjectExplorer.BuildSteps.Deploy + + 1 + ProjectExplorer.DefaultDeployConfiguration + + 1 + + + dwarf + + cpu-cycles + + + 250 + + -e + cpu-cycles + --call-graph + dwarf,4096 + -F + 250 + + -F + true + 4096 + false + false + 1000 + + true + + false + false + false + false + true + 0.01 + 10 + true + kcachegrind + 1 + 25 + + 1 + true + false + true + valgrind + + 0 + 1 + 2 + 3 + 4 + 5 + 6 + 7 + 8 + 9 + 10 + 11 + 12 + 13 + 14 + + 2 + + Qt4ProjectManager.Qt4RunConfiguration:D:/dev/software/softwareDirectory/AutoVerScheme/AutoVerScheme.pro + D:/dev/software/softwareDirectory/AutoVerScheme/AutoVerScheme.pro + + false + + false + true + true + false + false + true + + + + 1 + + + + ProjectExplorer.Project.TargetCount + 2 + + + ProjectExplorer.Project.Updater.FileVersion + 22 + + + Version + 22 + + diff --git a/softwareDirectory/AutoVerScheme/checkmethodmanage.ui b/softwareDirectory/AutoVerScheme/checkmethodmanage.ui index 648509b..da56d61 100644 --- a/softwareDirectory/AutoVerScheme/checkmethodmanage.ui +++ b/softwareDirectory/AutoVerScheme/checkmethodmanage.ui @@ -123,8 +123,7 @@ color: rgb(255, 255, 255); background-color: rgb(74, 102, 186); -border-radius:5px; -padding:10px 20px; +border-radius:5px; 查询 diff --git a/softwareDirectory/AutoVerScheme/checkwindow.cpp b/softwareDirectory/AutoVerScheme/checkwindow.cpp index 51650f9..da86ad4 100644 --- a/softwareDirectory/AutoVerScheme/checkwindow.cpp +++ b/softwareDirectory/AutoVerScheme/checkwindow.cpp @@ -9,12 +9,17 @@ ui(new Ui::CheckWindow) { ui->setupUi(this); - ui->tableWidgetDevice->setColumnCount(8); - ui->tableWidgetMethod->setColumnCount(7); + //ui->tableWidgetDevice->setColumnCount(8); + //ui->tableWidgetMethod->setColumnCount(7); + ui->tableWidgetDevice->verticalHeader()->setParent(nullptr); for(int i=2;i<8;i++) ui->tableWidgetDevice->horizontalHeader()->setSectionResizeMode(i,QHeaderView::Stretch); - for(int i=2;i<7;i++) + ui->tableWidgetMethod->verticalHeader()->setParent(nullptr); //隐藏行头 + for(int i=1;i<5;i++) ui->tableWidgetMethod->horizontalHeader()->setSectionResizeMode(i,QHeaderView::Stretch); + ui->tableWidgetMethod->setColumnWidth(0, 60); + ui->tableWidgetMethod->setColumnWidth(5, 100); + ui->tableWidget_3->verticalHeader()->setParent(nullptr); for(int i=0;i<2;i++) ui->tableWidget_3->horizontalHeader()->setSectionResizeMode(i,QHeaderView::Stretch); getCheckDevice(); @@ -24,12 +29,15 @@ CheckWindow::~CheckWindow() { + myTaskList.clear(); + programList.clear(); delete ui; } void CheckWindow::showMethod() { ui->stackedWidget->setCurrentIndex(1); + getCheckMethod(); } void CheckWindow::showDevice() @@ -46,6 +54,7 @@ { ui->stackedWidget_2->setCurrentIndex(0); ui->stackedWidget->setCurrentIndex(0); + getCheckDevice(); } void CheckWindow::showResult() @@ -57,18 +66,17 @@ void CheckWindow::getCheckDevice() { - - BaseCommonApi dbManager; - // 调用数据库管理器的函数获取数据 - + myTaskList.clear(); + ui->tableWidgetDevice->clearContents(); + ui->tableWidgetDevice->setRowCount(0); //模拟用户ID - QString userId="1640229293790650370"; - QList data = BaseCommonApi::getMyTasks(userId,"3"); + QString userId="1695282436182188034"; + myTaskList = BaseCommonApi::getMyTasks(userId,"3"); int rowCount = 0; int row=0; QString State; - for (const MyTask& myTask : data) { + for (const MyTask& myTask : myTaskList) { rowCount = ui->tableWidgetDevice->rowCount(); ui->tableWidgetDevice->insertRow(rowCount); @@ -87,3 +95,49 @@ row++; } } + +void CheckWindow::getCheckMethod() +{ + programList.clear(); + ui->tableWidgetMethod->clearContents(); + ui->tableWidgetMethod->setRowCount(0); + programList = BaseCommonApi::getVerificationProgramInfoMain(); + int rowCount = 0; + int row=0; + for (const VerificationProgramInfo& program : programList) { + rowCount = ui->tableWidgetMethod->rowCount(); + + ui->tableWidgetMethod->insertRow(rowCount); + QTableWidgetItem* p_check = new QTableWidgetItem(); + p_check->setCheckState(Qt::Unchecked); //设置首列为 CheckBox 控件 + ui->tableWidgetMethod->setItem(row,0,p_check); + ui->tableWidgetMethod->setItem(row, 1, new QTableWidgetItem(program.program_name)); //设置数据 + ui->tableWidgetMethod->setItem(row, 2, new QTableWidgetItem(program.create_name)); //设置数据 + ui->tableWidgetMethod->setItem(row, 3, new QTableWidgetItem(program.create_time.toString())); //设置数据 + ui->tableWidgetMethod->setItem(row, 4, new QTableWidgetItem(program.remark)); //设置数据 + + QPushButton *btn_1 = new QPushButton(); + btn_1->setText(tr("详情")); + btn_1->setStyleSheet("QPushButton{" + "background-color:rgba(255,255,255,0);" + "color:rgba(0,0,255,100);" + "text-decoration:underline;" + "}"); + btn_1->setCursor(Qt::PointingHandCursor); + connect(btn_1,SIGNAL(clicked()),this,SLOT(on_editButton_clicked())); + + btn_1->setIconSize(QSize(16,16)); + btn_1->setIcon(QIcon(":/image/Index/u2324.svg")); + QWidget *tmp_widget = new QWidget(); + QHBoxLayout *tmp_layout = new QHBoxLayout(tmp_widget); + tmp_layout->addWidget(btn_1); + tmp_layout->setMargin(0); + ui->tableWidgetMethod->setCellWidget(row,5,tmp_widget); + row++; + } +} + +void CheckWindow::on_editButton_clicked() +{ + +} diff --git a/softwareDirectory/AutoVerScheme/checkwindow.h b/softwareDirectory/AutoVerScheme/checkwindow.h index 005a85a..ea27646 100644 --- a/softwareDirectory/AutoVerScheme/checkwindow.h +++ b/softwareDirectory/AutoVerScheme/checkwindow.h @@ -2,6 +2,7 @@ #define CHECKWINDOW_H #include +#include "basecommonapi.h" namespace Ui { class CheckWindow; @@ -20,10 +21,14 @@ void showCheck(); void showMethodWidget(); void showResult(); + void on_editButton_clicked(); private: void getCheckDevice(); + void getCheckMethod(); private: Ui::CheckWindow *ui; + QList programList; + QList myTaskList; }; #endif // CHECKWINDOW_H diff --git a/softwareDirectory/AutoVerScheme/checkwindow.ui b/softwareDirectory/AutoVerScheme/checkwindow.ui index 20fbb81..1f7ef8c 100644 --- a/softwareDirectory/AutoVerScheme/checkwindow.ui +++ b/softwareDirectory/AutoVerScheme/checkwindow.ui @@ -598,11 +598,6 @@ - 序号 - - - - 检定程序名称 diff --git a/softwareDirectory/AutoVerScheme/formaddrsetting.cpp b/softwareDirectory/AutoVerScheme/formaddrsetting.cpp new file mode 100644 index 0000000..e0fb33a --- /dev/null +++ b/softwareDirectory/AutoVerScheme/formaddrsetting.cpp @@ -0,0 +1,14 @@ +#include "formaddrsetting.h" +#include "ui_formaddrsetting.h" + +FormAddrSetting::FormAddrSetting(QWidget *parent,int type,QString id) : + QWidget(parent), + ui(new Ui::FormAddrSetting) +{ + ui->setupUi(this); +} + +FormAddrSetting::~FormAddrSetting() +{ + delete ui; +} diff --git a/softwareDirectory/AutoVerScheme/formaddrsetting.h b/softwareDirectory/AutoVerScheme/formaddrsetting.h new file mode 100644 index 0000000..6392d44 --- /dev/null +++ b/softwareDirectory/AutoVerScheme/formaddrsetting.h @@ -0,0 +1,22 @@ +#ifndef FORMADDRSETTING_H +#define FORMADDRSETTING_H + +#include + +namespace Ui { +class FormAddrSetting; +} + +class FormAddrSetting : public QWidget +{ + Q_OBJECT + +public: + explicit FormAddrSetting(QWidget *parent = nullptr,int type=1,QString id=""); + ~FormAddrSetting(); + +private: + Ui::FormAddrSetting *ui; +}; + +#endif // FORMADDRSETTING_H diff --git a/softwareDirectory/AutoVerScheme/formaddrsetting.ui b/softwareDirectory/AutoVerScheme/formaddrsetting.ui new file mode 100644 index 0000000..9f73632 --- /dev/null +++ b/softwareDirectory/AutoVerScheme/formaddrsetting.ui @@ -0,0 +1,210 @@ + + + FormAddrSetting + + + + 0 + 0 + 1148 + 696 + + + + 设置通信命令 + + + background-color: rgb(242, 242, 242); + + + + + + 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); + + + 设置通信命令 + + + + + + + + + + + + + 20 + + + + + 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; + + + 新增 + + + + + + + + 1 + 0 + + + + + 72 + 26 + + + + + 12 + 75 + true + + + + color: rgb(255, 255, 255); +background-color: rgb(74, 102, 186); +border-radius:5px; + + + 删除 + + + + + + + + 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 + + + + + + + + + + + diff --git a/softwareDirectory/AutoVerScheme/AutoVerScheme.pro b/softwareDirectory/AutoVerScheme/AutoVerScheme.pro index 7864245..b84a377 100644 --- a/softwareDirectory/AutoVerScheme/AutoVerScheme.pro +++ b/softwareDirectory/AutoVerScheme/AutoVerScheme.pro @@ -31,7 +31,9 @@ depar_task.cpp \ depar_task_server.cpp \ dialogcheckresult.cpp \ + formaddrsetting.cpp \ formcheckpoint.cpp \ + formcommsetting.cpp \ formverypoint.cpp \ indexwindow.cpp \ infomanageview.cpp \ @@ -53,6 +55,8 @@ wordengine.cpp HEADERS += \ + formaddrsetting.h \ + formcommsetting.h \ id/IdWorker.h \ id/Noncopyable.h \ id/Singleton.h \ @@ -102,7 +106,9 @@ datasyncview.ui \ depar_task.ui \ dialogcheckresult.ui \ + formaddrsetting.ui \ formcheckpoint.ui \ + formcommsetting.ui \ formverypoint.ui \ indexwindow.ui \ infomanageview.ui \ diff --git a/softwareDirectory/AutoVerScheme/AutoVerScheme.pro.user b/softwareDirectory/AutoVerScheme/AutoVerScheme.pro.user new file mode 100644 index 0000000..2ced4d3 --- /dev/null +++ b/softwareDirectory/AutoVerScheme/AutoVerScheme.pro.user @@ -0,0 +1,562 @@ + + + + + + EnvironmentId + {2746248a-b112-4e0f-9ae0-9e61f2a42309} + + + ProjectExplorer.Project.ActiveTarget + 0 + + + ProjectExplorer.Project.EditorSettings + + true + false + true + + Cpp + + CppGlobal + + + + QmlJS + + QmlJSGlobal + + + 2 + UTF-8 + false + 4 + false + 80 + true + true + 1 + true + false + 0 + true + true + 0 + 8 + true + 1 + true + true + true + false + + + + ProjectExplorer.Project.PluginSettings + + + -fno-delayed-template-parsing + + true + + + + ProjectExplorer.Project.Target.0 + + Desktop Qt 5.14.2 MinGW 64-bit + Desktop Qt 5.14.2 MinGW 64-bit + qt.qt5.5142.win64_mingw73_kit + 0 + 0 + 0 + + D:/dev/software/softwareDirectory/build-AutoVerScheme-Desktop_Qt_5_14_2_MinGW_64_bit-Debug + + + true + QtProjectManager.QMakeBuildStep + true + + false + false + false + + + true + Qt4ProjectManager.MakeStep + + false + + + false + + 2 + Build + Build + ProjectExplorer.BuildSteps.Build + + + + true + Qt4ProjectManager.MakeStep + + true + clean + + false + + 1 + Clean + Clean + ProjectExplorer.BuildSteps.Clean + + 2 + false + + Debug + Qt4ProjectManager.Qt4BuildConfiguration + 2 + + + D:/dev/software/softwareDirectory/build-AutoVerScheme-Desktop_Qt_5_14_2_MinGW_64_bit-Release + + + true + QtProjectManager.QMakeBuildStep + false + + false + false + true + + + true + Qt4ProjectManager.MakeStep + + false + + + false + + 2 + Build + Build + ProjectExplorer.BuildSteps.Build + + + + true + Qt4ProjectManager.MakeStep + + true + clean + + false + + 1 + Clean + Clean + ProjectExplorer.BuildSteps.Clean + + 2 + false + + Release + Qt4ProjectManager.Qt4BuildConfiguration + 0 + + + D:/dev/software/softwareDirectory/build-AutoVerScheme-Desktop_Qt_5_14_2_MinGW_64_bit-Profile + + + true + QtProjectManager.QMakeBuildStep + true + + false + true + true + + + true + Qt4ProjectManager.MakeStep + + false + + + false + + 2 + Build + Build + ProjectExplorer.BuildSteps.Build + + + + true + Qt4ProjectManager.MakeStep + + true + clean + + false + + 1 + Clean + Clean + ProjectExplorer.BuildSteps.Clean + + 2 + false + + Profile + Qt4ProjectManager.Qt4BuildConfiguration + 0 + + 3 + + + 0 + Deploy + Deploy + ProjectExplorer.BuildSteps.Deploy + + 1 + ProjectExplorer.DefaultDeployConfiguration + + 1 + + + dwarf + + cpu-cycles + + + 250 + + -e + cpu-cycles + --call-graph + dwarf,4096 + -F + 250 + + -F + true + 4096 + false + false + 1000 + + true + + false + false + false + false + true + 0.01 + 10 + true + kcachegrind + 1 + 25 + + 1 + true + false + true + valgrind + + 0 + 1 + 2 + 3 + 4 + 5 + 6 + 7 + 8 + 9 + 10 + 11 + 12 + 13 + 14 + + 2 + + Qt4ProjectManager.Qt4RunConfiguration:D:/dev/software/softwareDirectory/AutoVerScheme/AutoVerScheme.pro + D:/dev/software/softwareDirectory/AutoVerScheme/AutoVerScheme.pro + + false + + false + true + true + false + false + true + + D:/dev/software/softwareDirectory/build-AutoVerScheme-Desktop_Qt_5_14_2_MinGW_64_bit-Debug + + 1 + + + + ProjectExplorer.Project.Target.1 + + Desktop Qt 5.14.2 MinGW 32-bit + Desktop Qt 5.14.2 MinGW 32-bit + qt.qt5.5142.win32_mingw73_kit + 0 + 0 + 0 + + D:/dev/software/softwareDirectory/build-AutoVerScheme-Desktop_Qt_5_14_2_MinGW_32_bit-Debug + + + true + QtProjectManager.QMakeBuildStep + true + + false + false + false + + + true + Qt4ProjectManager.MakeStep + + false + + + false + + 2 + Build + Build + ProjectExplorer.BuildSteps.Build + + + + true + Qt4ProjectManager.MakeStep + + true + clean + + false + + 1 + Clean + Clean + ProjectExplorer.BuildSteps.Clean + + 2 + false + + Debug + Qt4ProjectManager.Qt4BuildConfiguration + 2 + + + D:/dev/software/softwareDirectory/build-AutoVerScheme-Desktop_Qt_5_14_2_MinGW_32_bit-Release + + + true + QtProjectManager.QMakeBuildStep + false + + false + false + true + + + true + Qt4ProjectManager.MakeStep + + false + + + false + + 2 + Build + Build + ProjectExplorer.BuildSteps.Build + + + + true + Qt4ProjectManager.MakeStep + + true + clean + + false + + 1 + Clean + Clean + ProjectExplorer.BuildSteps.Clean + + 2 + false + + Release + Qt4ProjectManager.Qt4BuildConfiguration + 0 + + + D:/dev/software/softwareDirectory/build-AutoVerScheme-Desktop_Qt_5_14_2_MinGW_32_bit-Profile + + + true + QtProjectManager.QMakeBuildStep + true + + false + true + true + + + true + Qt4ProjectManager.MakeStep + + false + + + false + + 2 + Build + Build + ProjectExplorer.BuildSteps.Build + + + + true + Qt4ProjectManager.MakeStep + + true + clean + + false + + 1 + Clean + Clean + ProjectExplorer.BuildSteps.Clean + + 2 + false + + Profile + Qt4ProjectManager.Qt4BuildConfiguration + 0 + + 3 + + + 0 + Deploy + Deploy + ProjectExplorer.BuildSteps.Deploy + + 1 + ProjectExplorer.DefaultDeployConfiguration + + 1 + + + dwarf + + cpu-cycles + + + 250 + + -e + cpu-cycles + --call-graph + dwarf,4096 + -F + 250 + + -F + true + 4096 + false + false + 1000 + + true + + false + false + false + false + true + 0.01 + 10 + true + kcachegrind + 1 + 25 + + 1 + true + false + true + valgrind + + 0 + 1 + 2 + 3 + 4 + 5 + 6 + 7 + 8 + 9 + 10 + 11 + 12 + 13 + 14 + + 2 + + Qt4ProjectManager.Qt4RunConfiguration:D:/dev/software/softwareDirectory/AutoVerScheme/AutoVerScheme.pro + D:/dev/software/softwareDirectory/AutoVerScheme/AutoVerScheme.pro + + false + + false + true + true + false + false + true + + + + 1 + + + + ProjectExplorer.Project.TargetCount + 2 + + + ProjectExplorer.Project.Updater.FileVersion + 22 + + + Version + 22 + + diff --git a/softwareDirectory/AutoVerScheme/checkmethodmanage.ui b/softwareDirectory/AutoVerScheme/checkmethodmanage.ui index 648509b..da56d61 100644 --- a/softwareDirectory/AutoVerScheme/checkmethodmanage.ui +++ b/softwareDirectory/AutoVerScheme/checkmethodmanage.ui @@ -123,8 +123,7 @@ color: rgb(255, 255, 255); background-color: rgb(74, 102, 186); -border-radius:5px; -padding:10px 20px; +border-radius:5px; 查询 diff --git a/softwareDirectory/AutoVerScheme/checkwindow.cpp b/softwareDirectory/AutoVerScheme/checkwindow.cpp index 51650f9..da86ad4 100644 --- a/softwareDirectory/AutoVerScheme/checkwindow.cpp +++ b/softwareDirectory/AutoVerScheme/checkwindow.cpp @@ -9,12 +9,17 @@ ui(new Ui::CheckWindow) { ui->setupUi(this); - ui->tableWidgetDevice->setColumnCount(8); - ui->tableWidgetMethod->setColumnCount(7); + //ui->tableWidgetDevice->setColumnCount(8); + //ui->tableWidgetMethod->setColumnCount(7); + ui->tableWidgetDevice->verticalHeader()->setParent(nullptr); for(int i=2;i<8;i++) ui->tableWidgetDevice->horizontalHeader()->setSectionResizeMode(i,QHeaderView::Stretch); - for(int i=2;i<7;i++) + ui->tableWidgetMethod->verticalHeader()->setParent(nullptr); //隐藏行头 + for(int i=1;i<5;i++) ui->tableWidgetMethod->horizontalHeader()->setSectionResizeMode(i,QHeaderView::Stretch); + ui->tableWidgetMethod->setColumnWidth(0, 60); + ui->tableWidgetMethod->setColumnWidth(5, 100); + ui->tableWidget_3->verticalHeader()->setParent(nullptr); for(int i=0;i<2;i++) ui->tableWidget_3->horizontalHeader()->setSectionResizeMode(i,QHeaderView::Stretch); getCheckDevice(); @@ -24,12 +29,15 @@ CheckWindow::~CheckWindow() { + myTaskList.clear(); + programList.clear(); delete ui; } void CheckWindow::showMethod() { ui->stackedWidget->setCurrentIndex(1); + getCheckMethod(); } void CheckWindow::showDevice() @@ -46,6 +54,7 @@ { ui->stackedWidget_2->setCurrentIndex(0); ui->stackedWidget->setCurrentIndex(0); + getCheckDevice(); } void CheckWindow::showResult() @@ -57,18 +66,17 @@ void CheckWindow::getCheckDevice() { - - BaseCommonApi dbManager; - // 调用数据库管理器的函数获取数据 - + myTaskList.clear(); + ui->tableWidgetDevice->clearContents(); + ui->tableWidgetDevice->setRowCount(0); //模拟用户ID - QString userId="1640229293790650370"; - QList data = BaseCommonApi::getMyTasks(userId,"3"); + QString userId="1695282436182188034"; + myTaskList = BaseCommonApi::getMyTasks(userId,"3"); int rowCount = 0; int row=0; QString State; - for (const MyTask& myTask : data) { + for (const MyTask& myTask : myTaskList) { rowCount = ui->tableWidgetDevice->rowCount(); ui->tableWidgetDevice->insertRow(rowCount); @@ -87,3 +95,49 @@ row++; } } + +void CheckWindow::getCheckMethod() +{ + programList.clear(); + ui->tableWidgetMethod->clearContents(); + ui->tableWidgetMethod->setRowCount(0); + programList = BaseCommonApi::getVerificationProgramInfoMain(); + int rowCount = 0; + int row=0; + for (const VerificationProgramInfo& program : programList) { + rowCount = ui->tableWidgetMethod->rowCount(); + + ui->tableWidgetMethod->insertRow(rowCount); + QTableWidgetItem* p_check = new QTableWidgetItem(); + p_check->setCheckState(Qt::Unchecked); //设置首列为 CheckBox 控件 + ui->tableWidgetMethod->setItem(row,0,p_check); + ui->tableWidgetMethod->setItem(row, 1, new QTableWidgetItem(program.program_name)); //设置数据 + ui->tableWidgetMethod->setItem(row, 2, new QTableWidgetItem(program.create_name)); //设置数据 + ui->tableWidgetMethod->setItem(row, 3, new QTableWidgetItem(program.create_time.toString())); //设置数据 + ui->tableWidgetMethod->setItem(row, 4, new QTableWidgetItem(program.remark)); //设置数据 + + QPushButton *btn_1 = new QPushButton(); + btn_1->setText(tr("详情")); + btn_1->setStyleSheet("QPushButton{" + "background-color:rgba(255,255,255,0);" + "color:rgba(0,0,255,100);" + "text-decoration:underline;" + "}"); + btn_1->setCursor(Qt::PointingHandCursor); + connect(btn_1,SIGNAL(clicked()),this,SLOT(on_editButton_clicked())); + + btn_1->setIconSize(QSize(16,16)); + btn_1->setIcon(QIcon(":/image/Index/u2324.svg")); + QWidget *tmp_widget = new QWidget(); + QHBoxLayout *tmp_layout = new QHBoxLayout(tmp_widget); + tmp_layout->addWidget(btn_1); + tmp_layout->setMargin(0); + ui->tableWidgetMethod->setCellWidget(row,5,tmp_widget); + row++; + } +} + +void CheckWindow::on_editButton_clicked() +{ + +} diff --git a/softwareDirectory/AutoVerScheme/checkwindow.h b/softwareDirectory/AutoVerScheme/checkwindow.h index 005a85a..ea27646 100644 --- a/softwareDirectory/AutoVerScheme/checkwindow.h +++ b/softwareDirectory/AutoVerScheme/checkwindow.h @@ -2,6 +2,7 @@ #define CHECKWINDOW_H #include +#include "basecommonapi.h" namespace Ui { class CheckWindow; @@ -20,10 +21,14 @@ void showCheck(); void showMethodWidget(); void showResult(); + void on_editButton_clicked(); private: void getCheckDevice(); + void getCheckMethod(); private: Ui::CheckWindow *ui; + QList programList; + QList myTaskList; }; #endif // CHECKWINDOW_H diff --git a/softwareDirectory/AutoVerScheme/checkwindow.ui b/softwareDirectory/AutoVerScheme/checkwindow.ui index 20fbb81..1f7ef8c 100644 --- a/softwareDirectory/AutoVerScheme/checkwindow.ui +++ b/softwareDirectory/AutoVerScheme/checkwindow.ui @@ -598,11 +598,6 @@ - 序号 - - - - 检定程序名称 diff --git a/softwareDirectory/AutoVerScheme/formaddrsetting.cpp b/softwareDirectory/AutoVerScheme/formaddrsetting.cpp new file mode 100644 index 0000000..e0fb33a --- /dev/null +++ b/softwareDirectory/AutoVerScheme/formaddrsetting.cpp @@ -0,0 +1,14 @@ +#include "formaddrsetting.h" +#include "ui_formaddrsetting.h" + +FormAddrSetting::FormAddrSetting(QWidget *parent,int type,QString id) : + QWidget(parent), + ui(new Ui::FormAddrSetting) +{ + ui->setupUi(this); +} + +FormAddrSetting::~FormAddrSetting() +{ + delete ui; +} diff --git a/softwareDirectory/AutoVerScheme/formaddrsetting.h b/softwareDirectory/AutoVerScheme/formaddrsetting.h new file mode 100644 index 0000000..6392d44 --- /dev/null +++ b/softwareDirectory/AutoVerScheme/formaddrsetting.h @@ -0,0 +1,22 @@ +#ifndef FORMADDRSETTING_H +#define FORMADDRSETTING_H + +#include + +namespace Ui { +class FormAddrSetting; +} + +class FormAddrSetting : public QWidget +{ + Q_OBJECT + +public: + explicit FormAddrSetting(QWidget *parent = nullptr,int type=1,QString id=""); + ~FormAddrSetting(); + +private: + Ui::FormAddrSetting *ui; +}; + +#endif // FORMADDRSETTING_H diff --git a/softwareDirectory/AutoVerScheme/formaddrsetting.ui b/softwareDirectory/AutoVerScheme/formaddrsetting.ui new file mode 100644 index 0000000..9f73632 --- /dev/null +++ b/softwareDirectory/AutoVerScheme/formaddrsetting.ui @@ -0,0 +1,210 @@ + + + FormAddrSetting + + + + 0 + 0 + 1148 + 696 + + + + 设置通信命令 + + + background-color: rgb(242, 242, 242); + + + + + + 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); + + + 设置通信命令 + + + + + + + + + + + + + 20 + + + + + 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; + + + 新增 + + + + + + + + 1 + 0 + + + + + 72 + 26 + + + + + 12 + 75 + true + + + + color: rgb(255, 255, 255); +background-color: rgb(74, 102, 186); +border-radius:5px; + + + 删除 + + + + + + + + 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 + + + + + + + + + + + diff --git a/softwareDirectory/AutoVerScheme/formcheckpoint.cpp b/softwareDirectory/AutoVerScheme/formcheckpoint.cpp index 8053e94..cdc2e22 100644 --- a/softwareDirectory/AutoVerScheme/formcheckpoint.cpp +++ b/softwareDirectory/AutoVerScheme/formcheckpoint.cpp @@ -4,12 +4,13 @@ FormCheckPoint::FormCheckPoint(QWidget *parent,QString sId) : QWidget(parent), + checkId(sId), ui(new Ui::FormCheckPoint) { ui->setupUi(this); - if(sId!="") + if(checkId!="") { - + updateTable(checkId); } } @@ -17,3 +18,45 @@ { delete ui; } + +void FormCheckPoint::updateTable(QString id) +{ + //获取核查点tablewight的数据 + QStringList headlist; + + QList Data=BaseCommonApi::Search_CalibrationTable(id,&headlist); + + //tableWidgetItem + ui->tableWidget->setRowCount(0); + ui->tableWidget->setColumnCount(headlist.count()); + ui->tableWidget->setHorizontalHeaderLabels(headlist); + ui->tableWidget->verticalHeader()->setParent(nullptr); //隐藏行头 + for(int i=0;itableWidget->horizontalHeader()->setSectionResizeMode(i,QHeaderView::Stretch); + } + //循环数据 + int rowCount=0; + int row=0; + for (const QStringList& item : Data) + { + //获取行号 并进行添加行 + rowCount = ui->tableWidget->rowCount(); + ui->tableWidget->insertRow(rowCount); + //添加 序号 + ui->tableWidget->setItem(row, 0, new QTableWidgetItem(QString::number(row+1))); + //循环读取值 headlist，count是列的数量 + for(int i=1;itableWidget->setItem(row, i, new QTableWidgetItem(item[i])); + } + + row++; + + } +} + +void FormCheckPoint::on_pushButton_14_clicked() +{ + this->close(); +} diff --git a/softwareDirectory/AutoVerScheme/AutoVerScheme.pro b/softwareDirectory/AutoVerScheme/AutoVerScheme.pro index 7864245..b84a377 100644 --- a/softwareDirectory/AutoVerScheme/AutoVerScheme.pro +++ b/softwareDirectory/AutoVerScheme/AutoVerScheme.pro @@ -31,7 +31,9 @@ depar_task.cpp \ depar_task_server.cpp \ dialogcheckresult.cpp \ + formaddrsetting.cpp \ formcheckpoint.cpp \ + formcommsetting.cpp \ formverypoint.cpp \ indexwindow.cpp \ infomanageview.cpp \ @@ -53,6 +55,8 @@ wordengine.cpp HEADERS += \ + formaddrsetting.h \ + formcommsetting.h \ id/IdWorker.h \ id/Noncopyable.h \ id/Singleton.h \ @@ -102,7 +106,9 @@ datasyncview.ui \ depar_task.ui \ dialogcheckresult.ui \ + formaddrsetting.ui \ formcheckpoint.ui \ + formcommsetting.ui \ formverypoint.ui \ indexwindow.ui \ infomanageview.ui \ diff --git a/softwareDirectory/AutoVerScheme/AutoVerScheme.pro.user b/softwareDirectory/AutoVerScheme/AutoVerScheme.pro.user new file mode 100644 index 0000000..2ced4d3 --- /dev/null +++ b/softwareDirectory/AutoVerScheme/AutoVerScheme.pro.user @@ -0,0 +1,562 @@ + + + + + + EnvironmentId + {2746248a-b112-4e0f-9ae0-9e61f2a42309} + + + ProjectExplorer.Project.ActiveTarget + 0 + + + ProjectExplorer.Project.EditorSettings + + true + false + true + + Cpp + + CppGlobal + + + + QmlJS + + QmlJSGlobal + + + 2 + UTF-8 + false + 4 + false + 80 + true + true + 1 + true + false + 0 + true + true + 0 + 8 + true + 1 + true + true + true + false + + + + ProjectExplorer.Project.PluginSettings + + + -fno-delayed-template-parsing + + true + + + + ProjectExplorer.Project.Target.0 + + Desktop Qt 5.14.2 MinGW 64-bit + Desktop Qt 5.14.2 MinGW 64-bit + qt.qt5.5142.win64_mingw73_kit + 0 + 0 + 0 + + D:/dev/software/softwareDirectory/build-AutoVerScheme-Desktop_Qt_5_14_2_MinGW_64_bit-Debug + + + true + QtProjectManager.QMakeBuildStep + true + + false + false + false + + + true + Qt4ProjectManager.MakeStep + + false + + + false + + 2 + Build + Build + ProjectExplorer.BuildSteps.Build + + + + true + Qt4ProjectManager.MakeStep + + true + clean + + false + + 1 + Clean + Clean + ProjectExplorer.BuildSteps.Clean + + 2 + false + + Debug + Qt4ProjectManager.Qt4BuildConfiguration + 2 + + + D:/dev/software/softwareDirectory/build-AutoVerScheme-Desktop_Qt_5_14_2_MinGW_64_bit-Release + + + true + QtProjectManager.QMakeBuildStep + false + + false + false + true + + + true + Qt4ProjectManager.MakeStep + + false + + + false + + 2 + Build + Build + ProjectExplorer.BuildSteps.Build + + + + true + Qt4ProjectManager.MakeStep + + true + clean + + false + + 1 + Clean + Clean + ProjectExplorer.BuildSteps.Clean + + 2 + false + + Release + Qt4ProjectManager.Qt4BuildConfiguration + 0 + + + D:/dev/software/softwareDirectory/build-AutoVerScheme-Desktop_Qt_5_14_2_MinGW_64_bit-Profile + + + true + QtProjectManager.QMakeBuildStep + true + + false + true + true + + + true + Qt4ProjectManager.MakeStep + + false + + + false + + 2 + Build + Build + ProjectExplorer.BuildSteps.Build + + + + true + Qt4ProjectManager.MakeStep + + true + clean + + false + + 1 + Clean + Clean + ProjectExplorer.BuildSteps.Clean + + 2 + false + + Profile + Qt4ProjectManager.Qt4BuildConfiguration + 0 + + 3 + + + 0 + Deploy + Deploy + ProjectExplorer.BuildSteps.Deploy + + 1 + ProjectExplorer.DefaultDeployConfiguration + + 1 + + + dwarf + + cpu-cycles + + + 250 + + -e + cpu-cycles + --call-graph + dwarf,4096 + -F + 250 + + -F + true + 4096 + false + false + 1000 + + true + + false + false + false + false + true + 0.01 + 10 + true + kcachegrind + 1 + 25 + + 1 + true + false + true + valgrind + + 0 + 1 + 2 + 3 + 4 + 5 + 6 + 7 + 8 + 9 + 10 + 11 + 12 + 13 + 14 + + 2 + + Qt4ProjectManager.Qt4RunConfiguration:D:/dev/software/softwareDirectory/AutoVerScheme/AutoVerScheme.pro + D:/dev/software/softwareDirectory/AutoVerScheme/AutoVerScheme.pro + + false + + false + true + true + false + false + true + + D:/dev/software/softwareDirectory/build-AutoVerScheme-Desktop_Qt_5_14_2_MinGW_64_bit-Debug + + 1 + + + + ProjectExplorer.Project.Target.1 + + Desktop Qt 5.14.2 MinGW 32-bit + Desktop Qt 5.14.2 MinGW 32-bit + qt.qt5.5142.win32_mingw73_kit + 0 + 0 + 0 + + D:/dev/software/softwareDirectory/build-AutoVerScheme-Desktop_Qt_5_14_2_MinGW_32_bit-Debug + + + true + QtProjectManager.QMakeBuildStep + true + + false + false + false + + + true + Qt4ProjectManager.MakeStep + + false + + + false + + 2 + Build + Build + ProjectExplorer.BuildSteps.Build + + + + true + Qt4ProjectManager.MakeStep + + true + clean + + false + + 1 + Clean + Clean + ProjectExplorer.BuildSteps.Clean + + 2 + false + + Debug + Qt4ProjectManager.Qt4BuildConfiguration + 2 + + + D:/dev/software/softwareDirectory/build-AutoVerScheme-Desktop_Qt_5_14_2_MinGW_32_bit-Release + + + true + QtProjectManager.QMakeBuildStep + false + + false + false + true + + + true + Qt4ProjectManager.MakeStep + + false + + + false + + 2 + Build + Build + ProjectExplorer.BuildSteps.Build + + + + true + Qt4ProjectManager.MakeStep + + true + clean + + false + + 1 + Clean + Clean + ProjectExplorer.BuildSteps.Clean + + 2 + false + + Release + Qt4ProjectManager.Qt4BuildConfiguration + 0 + + + D:/dev/software/softwareDirectory/build-AutoVerScheme-Desktop_Qt_5_14_2_MinGW_32_bit-Profile + + + true + QtProjectManager.QMakeBuildStep + true + + false + true + true + + + true + Qt4ProjectManager.MakeStep + + false + + + false + + 2 + Build + Build + ProjectExplorer.BuildSteps.Build + + + + true + Qt4ProjectManager.MakeStep + + true + clean + + false + + 1 + Clean + Clean + ProjectExplorer.BuildSteps.Clean + + 2 + false + + Profile + Qt4ProjectManager.Qt4BuildConfiguration + 0 + + 3 + + + 0 + Deploy + Deploy + ProjectExplorer.BuildSteps.Deploy + + 1 + ProjectExplorer.DefaultDeployConfiguration + + 1 + + + dwarf + + cpu-cycles + + + 250 + + -e + cpu-cycles + --call-graph + dwarf,4096 + -F + 250 + + -F + true + 4096 + false + false + 1000 + + true + + false + false + false + false + true + 0.01 + 10 + true + kcachegrind + 1 + 25 + + 1 + true + false + true + valgrind + + 0 + 1 + 2 + 3 + 4 + 5 + 6 + 7 + 8 + 9 + 10 + 11 + 12 + 13 + 14 + + 2 + + Qt4ProjectManager.Qt4RunConfiguration:D:/dev/software/softwareDirectory/AutoVerScheme/AutoVerScheme.pro + D:/dev/software/softwareDirectory/AutoVerScheme/AutoVerScheme.pro + + false + + false + true + true + false + false + true + + + + 1 + + + + ProjectExplorer.Project.TargetCount + 2 + + + ProjectExplorer.Project.Updater.FileVersion + 22 + + + Version + 22 + + diff --git a/softwareDirectory/AutoVerScheme/checkmethodmanage.ui b/softwareDirectory/AutoVerScheme/checkmethodmanage.ui index 648509b..da56d61 100644 --- a/softwareDirectory/AutoVerScheme/checkmethodmanage.ui +++ b/softwareDirectory/AutoVerScheme/checkmethodmanage.ui @@ -123,8 +123,7 @@ color: rgb(255, 255, 255); background-color: rgb(74, 102, 186); -border-radius:5px; -padding:10px 20px; +border-radius:5px; 查询 diff --git a/softwareDirectory/AutoVerScheme/checkwindow.cpp b/softwareDirectory/AutoVerScheme/checkwindow.cpp index 51650f9..da86ad4 100644 --- a/softwareDirectory/AutoVerScheme/checkwindow.cpp +++ b/softwareDirectory/AutoVerScheme/checkwindow.cpp @@ -9,12 +9,17 @@ ui(new Ui::CheckWindow) { ui->setupUi(this); - ui->tableWidgetDevice->setColumnCount(8); - ui->tableWidgetMethod->setColumnCount(7); + //ui->tableWidgetDevice->setColumnCount(8); + //ui->tableWidgetMethod->setColumnCount(7); + ui->tableWidgetDevice->verticalHeader()->setParent(nullptr); for(int i=2;i<8;i++) ui->tableWidgetDevice->horizontalHeader()->setSectionResizeMode(i,QHeaderView::Stretch); - for(int i=2;i<7;i++) + ui->tableWidgetMethod->verticalHeader()->setParent(nullptr); //隐藏行头 + for(int i=1;i<5;i++) ui->tableWidgetMethod->horizontalHeader()->setSectionResizeMode(i,QHeaderView::Stretch); + ui->tableWidgetMethod->setColumnWidth(0, 60); + ui->tableWidgetMethod->setColumnWidth(5, 100); + ui->tableWidget_3->verticalHeader()->setParent(nullptr); for(int i=0;i<2;i++) ui->tableWidget_3->horizontalHeader()->setSectionResizeMode(i,QHeaderView::Stretch); getCheckDevice(); @@ -24,12 +29,15 @@ CheckWindow::~CheckWindow() { + myTaskList.clear(); + programList.clear(); delete ui; } void CheckWindow::showMethod() { ui->stackedWidget->setCurrentIndex(1); + getCheckMethod(); } void CheckWindow::showDevice() @@ -46,6 +54,7 @@ { ui->stackedWidget_2->setCurrentIndex(0); ui->stackedWidget->setCurrentIndex(0); + getCheckDevice(); } void CheckWindow::showResult() @@ -57,18 +66,17 @@ void CheckWindow::getCheckDevice() { - - BaseCommonApi dbManager; - // 调用数据库管理器的函数获取数据 - + myTaskList.clear(); + ui->tableWidgetDevice->clearContents(); + ui->tableWidgetDevice->setRowCount(0); //模拟用户ID - QString userId="1640229293790650370"; - QList data = BaseCommonApi::getMyTasks(userId,"3"); + QString userId="1695282436182188034"; + myTaskList = BaseCommonApi::getMyTasks(userId,"3"); int rowCount = 0; int row=0; QString State; - for (const MyTask& myTask : data) { + for (const MyTask& myTask : myTaskList) { rowCount = ui->tableWidgetDevice->rowCount(); ui->tableWidgetDevice->insertRow(rowCount); @@ -87,3 +95,49 @@ row++; } } + +void CheckWindow::getCheckMethod() +{ + programList.clear(); + ui->tableWidgetMethod->clearContents(); + ui->tableWidgetMethod->setRowCount(0); + programList = BaseCommonApi::getVerificationProgramInfoMain(); + int rowCount = 0; + int row=0; + for (const VerificationProgramInfo& program : programList) { + rowCount = ui->tableWidgetMethod->rowCount(); + + ui->tableWidgetMethod->insertRow(rowCount); + QTableWidgetItem* p_check = new QTableWidgetItem(); + p_check->setCheckState(Qt::Unchecked); //设置首列为 CheckBox 控件 + ui->tableWidgetMethod->setItem(row,0,p_check); + ui->tableWidgetMethod->setItem(row, 1, new QTableWidgetItem(program.program_name)); //设置数据 + ui->tableWidgetMethod->setItem(row, 2, new QTableWidgetItem(program.create_name)); //设置数据 + ui->tableWidgetMethod->setItem(row, 3, new QTableWidgetItem(program.create_time.toString())); //设置数据 + ui->tableWidgetMethod->setItem(row, 4, new QTableWidgetItem(program.remark)); //设置数据 + + QPushButton *btn_1 = new QPushButton(); + btn_1->setText(tr("详情")); + btn_1->setStyleSheet("QPushButton{" + "background-color:rgba(255,255,255,0);" + "color:rgba(0,0,255,100);" + "text-decoration:underline;" + "}"); + btn_1->setCursor(Qt::PointingHandCursor); + connect(btn_1,SIGNAL(clicked()),this,SLOT(on_editButton_clicked())); + + btn_1->setIconSize(QSize(16,16)); + btn_1->setIcon(QIcon(":/image/Index/u2324.svg")); + QWidget *tmp_widget = new QWidget(); + QHBoxLayout *tmp_layout = new QHBoxLayout(tmp_widget); + tmp_layout->addWidget(btn_1); + tmp_layout->setMargin(0); + ui->tableWidgetMethod->setCellWidget(row,5,tmp_widget); + row++; + } +} + +void CheckWindow::on_editButton_clicked() +{ + +} diff --git a/softwareDirectory/AutoVerScheme/checkwindow.h b/softwareDirectory/AutoVerScheme/checkwindow.h index 005a85a..ea27646 100644 --- a/softwareDirectory/AutoVerScheme/checkwindow.h +++ b/softwareDirectory/AutoVerScheme/checkwindow.h @@ -2,6 +2,7 @@ #define CHECKWINDOW_H #include +#include "basecommonapi.h" namespace Ui { class CheckWindow; @@ -20,10 +21,14 @@ void showCheck(); void showMethodWidget(); void showResult(); + void on_editButton_clicked(); private: void getCheckDevice(); + void getCheckMethod(); private: Ui::CheckWindow *ui; + QList programList; + QList myTaskList; }; #endif // CHECKWINDOW_H diff --git a/softwareDirectory/AutoVerScheme/checkwindow.ui b/softwareDirectory/AutoVerScheme/checkwindow.ui index 20fbb81..1f7ef8c 100644 --- a/softwareDirectory/AutoVerScheme/checkwindow.ui +++ b/softwareDirectory/AutoVerScheme/checkwindow.ui @@ -598,11 +598,6 @@ - 序号 - - - - 检定程序名称 diff --git a/softwareDirectory/AutoVerScheme/formaddrsetting.cpp b/softwareDirectory/AutoVerScheme/formaddrsetting.cpp new file mode 100644 index 0000000..e0fb33a --- /dev/null +++ b/softwareDirectory/AutoVerScheme/formaddrsetting.cpp @@ -0,0 +1,14 @@ +#include "formaddrsetting.h" +#include "ui_formaddrsetting.h" + +FormAddrSetting::FormAddrSetting(QWidget *parent,int type,QString id) : + QWidget(parent), + ui(new Ui::FormAddrSetting) +{ + ui->setupUi(this); +} + +FormAddrSetting::~FormAddrSetting() +{ + delete ui; +} diff --git a/softwareDirectory/AutoVerScheme/formaddrsetting.h b/softwareDirectory/AutoVerScheme/formaddrsetting.h new file mode 100644 index 0000000..6392d44 --- /dev/null +++ b/softwareDirectory/AutoVerScheme/formaddrsetting.h @@ -0,0 +1,22 @@ +#ifndef FORMADDRSETTING_H +#define FORMADDRSETTING_H + +#include + +namespace Ui { +class FormAddrSetting; +} + +class FormAddrSetting : public QWidget +{ + Q_OBJECT + +public: + explicit FormAddrSetting(QWidget *parent = nullptr,int type=1,QString id=""); + ~FormAddrSetting(); + +private: + Ui::FormAddrSetting *ui; +}; + +#endif // FORMADDRSETTING_H diff --git a/softwareDirectory/AutoVerScheme/formaddrsetting.ui b/softwareDirectory/AutoVerScheme/formaddrsetting.ui new file mode 100644 index 0000000..9f73632 --- /dev/null +++ b/softwareDirectory/AutoVerScheme/formaddrsetting.ui @@ -0,0 +1,210 @@ + + + FormAddrSetting + + + + 0 + 0 + 1148 + 696 + + + + 设置通信命令 + + + background-color: rgb(242, 242, 242); + + + + + + 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); + + + 设置通信命令 + + + + + + + + + + + + + 20 + + + + + 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; + + + 新增 + + + + + + + + 1 + 0 + + + + + 72 + 26 + + + + + 12 + 75 + true + + + + color: rgb(255, 255, 255); +background-color: rgb(74, 102, 186); +border-radius:5px; + + + 删除 + + + + + + + + 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 + + + + + + + + + + + diff --git a/softwareDirectory/AutoVerScheme/formcheckpoint.cpp b/softwareDirectory/AutoVerScheme/formcheckpoint.cpp index 8053e94..cdc2e22 100644 --- a/softwareDirectory/AutoVerScheme/formcheckpoint.cpp +++ b/softwareDirectory/AutoVerScheme/formcheckpoint.cpp @@ -4,12 +4,13 @@ FormCheckPoint::FormCheckPoint(QWidget *parent,QString sId) : QWidget(parent), + checkId(sId), ui(new Ui::FormCheckPoint) { ui->setupUi(this); - if(sId!="") + if(checkId!="") { - + updateTable(checkId); } } @@ -17,3 +18,45 @@ { delete ui; } + +void FormCheckPoint::updateTable(QString id) +{ + //获取核查点tablewight的数据 + QStringList headlist; + + QList Data=BaseCommonApi::Search_CalibrationTable(id,&headlist); + + //tableWidgetItem + ui->tableWidget->setRowCount(0); + ui->tableWidget->setColumnCount(headlist.count()); + ui->tableWidget->setHorizontalHeaderLabels(headlist); + ui->tableWidget->verticalHeader()->setParent(nullptr); //隐藏行头 + for(int i=0;itableWidget->horizontalHeader()->setSectionResizeMode(i,QHeaderView::Stretch); + } + //循环数据 + int rowCount=0; + int row=0; + for (const QStringList& item : Data) + { + //获取行号 并进行添加行 + rowCount = ui->tableWidget->rowCount(); + ui->tableWidget->insertRow(rowCount); + //添加 序号 + ui->tableWidget->setItem(row, 0, new QTableWidgetItem(QString::number(row+1))); + //循环读取值 headlist，count是列的数量 + for(int i=1;itableWidget->setItem(row, i, new QTableWidgetItem(item[i])); + } + + row++; + + } +} + +void FormCheckPoint::on_pushButton_14_clicked() +{ + this->close(); +} diff --git a/softwareDirectory/AutoVerScheme/formcheckpoint.h b/softwareDirectory/AutoVerScheme/formcheckpoint.h index b54434b..3cbcd8e 100644 --- a/softwareDirectory/AutoVerScheme/formcheckpoint.h +++ b/softwareDirectory/AutoVerScheme/formcheckpoint.h @@ -12,11 +12,16 @@ Q_OBJECT public: - explicit FormCheckPoint(QWidget *parent = nullptr,QString checkId=""); + explicit FormCheckPoint(QWidget *parent = nullptr,QString sId=""); ~FormCheckPoint(); +private slots: + void on_pushButton_14_clicked(); private: + void updateTable(QString id); +private: Ui::FormCheckPoint *ui; + QString checkId=""; }; #endif // FORMCHECKPOINT_H diff --git a/softwareDirectory/AutoVerScheme/AutoVerScheme.pro b/softwareDirectory/AutoVerScheme/AutoVerScheme.pro index 7864245..b84a377 100644 --- a/softwareDirectory/AutoVerScheme/AutoVerScheme.pro +++ b/softwareDirectory/AutoVerScheme/AutoVerScheme.pro @@ -31,7 +31,9 @@ depar_task.cpp \ depar_task_server.cpp \ dialogcheckresult.cpp \ + formaddrsetting.cpp \ formcheckpoint.cpp \ + formcommsetting.cpp \ formverypoint.cpp \ indexwindow.cpp \ infomanageview.cpp \ @@ -53,6 +55,8 @@ wordengine.cpp HEADERS += \ + formaddrsetting.h \ + formcommsetting.h \ id/IdWorker.h \ id/Noncopyable.h \ id/Singleton.h \ @@ -102,7 +106,9 @@ datasyncview.ui \ depar_task.ui \ dialogcheckresult.ui \ + formaddrsetting.ui \ formcheckpoint.ui \ + formcommsetting.ui \ formverypoint.ui \ indexwindow.ui \ infomanageview.ui \ diff --git a/softwareDirectory/AutoVerScheme/AutoVerScheme.pro.user b/softwareDirectory/AutoVerScheme/AutoVerScheme.pro.user new file mode 100644 index 0000000..2ced4d3 --- /dev/null +++ b/softwareDirectory/AutoVerScheme/AutoVerScheme.pro.user @@ -0,0 +1,562 @@ + + + + + + EnvironmentId + {2746248a-b112-4e0f-9ae0-9e61f2a42309} + + + ProjectExplorer.Project.ActiveTarget + 0 + + + ProjectExplorer.Project.EditorSettings + + true + false + true + + Cpp + + CppGlobal + + + + QmlJS + + QmlJSGlobal + + + 2 + UTF-8 + false + 4 + false + 80 + true + true + 1 + true + false + 0 + true + true + 0 + 8 + true + 1 + true + true + true + false + + + + ProjectExplorer.Project.PluginSettings + + + -fno-delayed-template-parsing + + true + + + + ProjectExplorer.Project.Target.0 + + Desktop Qt 5.14.2 MinGW 64-bit + Desktop Qt 5.14.2 MinGW 64-bit + qt.qt5.5142.win64_mingw73_kit + 0 + 0 + 0 + + D:/dev/software/softwareDirectory/build-AutoVerScheme-Desktop_Qt_5_14_2_MinGW_64_bit-Debug + + + true + QtProjectManager.QMakeBuildStep + true + + false + false + false + + + true + Qt4ProjectManager.MakeStep + + false + + + false + + 2 + Build + Build + ProjectExplorer.BuildSteps.Build + + + + true + Qt4ProjectManager.MakeStep + + true + clean + + false + + 1 + Clean + Clean + ProjectExplorer.BuildSteps.Clean + + 2 + false + + Debug + Qt4ProjectManager.Qt4BuildConfiguration + 2 + + + D:/dev/software/softwareDirectory/build-AutoVerScheme-Desktop_Qt_5_14_2_MinGW_64_bit-Release + + + true + QtProjectManager.QMakeBuildStep + false + + false + false + true + + + true + Qt4ProjectManager.MakeStep + + false + + + false + + 2 + Build + Build + ProjectExplorer.BuildSteps.Build + + + + true + Qt4ProjectManager.MakeStep + + true + clean + + false + + 1 + Clean + Clean + ProjectExplorer.BuildSteps.Clean + + 2 + false + + Release + Qt4ProjectManager.Qt4BuildConfiguration + 0 + + + D:/dev/software/softwareDirectory/build-AutoVerScheme-Desktop_Qt_5_14_2_MinGW_64_bit-Profile + + + true + QtProjectManager.QMakeBuildStep + true + + false + true + true + + + true + Qt4ProjectManager.MakeStep + + false + + + false + + 2 + Build + Build + ProjectExplorer.BuildSteps.Build + + + + true + Qt4ProjectManager.MakeStep + + true + clean + + false + + 1 + Clean + Clean + ProjectExplorer.BuildSteps.Clean + + 2 + false + + Profile + Qt4ProjectManager.Qt4BuildConfiguration + 0 + + 3 + + + 0 + Deploy + Deploy + ProjectExplorer.BuildSteps.Deploy + + 1 + ProjectExplorer.DefaultDeployConfiguration + + 1 + + + dwarf + + cpu-cycles + + + 250 + + -e + cpu-cycles + --call-graph + dwarf,4096 + -F + 250 + + -F + true + 4096 + false + false + 1000 + + true + + false + false + false + false + true + 0.01 + 10 + true + kcachegrind + 1 + 25 + + 1 + true + false + true + valgrind + + 0 + 1 + 2 + 3 + 4 + 5 + 6 + 7 + 8 + 9 + 10 + 11 + 12 + 13 + 14 + + 2 + + Qt4ProjectManager.Qt4RunConfiguration:D:/dev/software/softwareDirectory/AutoVerScheme/AutoVerScheme.pro + D:/dev/software/softwareDirectory/AutoVerScheme/AutoVerScheme.pro + + false + + false + true + true + false + false + true + + D:/dev/software/softwareDirectory/build-AutoVerScheme-Desktop_Qt_5_14_2_MinGW_64_bit-Debug + + 1 + + + + ProjectExplorer.Project.Target.1 + + Desktop Qt 5.14.2 MinGW 32-bit + Desktop Qt 5.14.2 MinGW 32-bit + qt.qt5.5142.win32_mingw73_kit + 0 + 0 + 0 + + D:/dev/software/softwareDirectory/build-AutoVerScheme-Desktop_Qt_5_14_2_MinGW_32_bit-Debug + + + true + QtProjectManager.QMakeBuildStep + true + + false + false + false + + + true + Qt4ProjectManager.MakeStep + + false + + + false + + 2 + Build + Build + ProjectExplorer.BuildSteps.Build + + + + true + Qt4ProjectManager.MakeStep + + true + clean + + false + + 1 + Clean + Clean + ProjectExplorer.BuildSteps.Clean + + 2 + false + + Debug + Qt4ProjectManager.Qt4BuildConfiguration + 2 + + + D:/dev/software/softwareDirectory/build-AutoVerScheme-Desktop_Qt_5_14_2_MinGW_32_bit-Release + + + true + QtProjectManager.QMakeBuildStep + false + + false + false + true + + + true + Qt4ProjectManager.MakeStep + + false + + + false + + 2 + Build + Build + ProjectExplorer.BuildSteps.Build + + + + true + Qt4ProjectManager.MakeStep + + true + clean + + false + + 1 + Clean + Clean + ProjectExplorer.BuildSteps.Clean + + 2 + false + + Release + Qt4ProjectManager.Qt4BuildConfiguration + 0 + + + D:/dev/software/softwareDirectory/build-AutoVerScheme-Desktop_Qt_5_14_2_MinGW_32_bit-Profile + + + true + QtProjectManager.QMakeBuildStep + true + + false + true + true + + + true + Qt4ProjectManager.MakeStep + + false + + + false + + 2 + Build + Build + ProjectExplorer.BuildSteps.Build + + + + true + Qt4ProjectManager.MakeStep + + true + clean + + false + + 1 + Clean + Clean + ProjectExplorer.BuildSteps.Clean + + 2 + false + + Profile + Qt4ProjectManager.Qt4BuildConfiguration + 0 + + 3 + + + 0 + Deploy + Deploy + ProjectExplorer.BuildSteps.Deploy + + 1 + ProjectExplorer.DefaultDeployConfiguration + + 1 + + + dwarf + + cpu-cycles + + + 250 + + -e + cpu-cycles + --call-graph + dwarf,4096 + -F + 250 + + -F + true + 4096 + false + false + 1000 + + true + + false + false + false + false + true + 0.01 + 10 + true + kcachegrind + 1 + 25 + + 1 + true + false + true + valgrind + + 0 + 1 + 2 + 3 + 4 + 5 + 6 + 7 + 8 + 9 + 10 + 11 + 12 + 13 + 14 + + 2 + + Qt4ProjectManager.Qt4RunConfiguration:D:/dev/software/softwareDirectory/AutoVerScheme/AutoVerScheme.pro + D:/dev/software/softwareDirectory/AutoVerScheme/AutoVerScheme.pro + + false + + false + true + true + false + false + true + + + + 1 + + + + ProjectExplorer.Project.TargetCount + 2 + + + ProjectExplorer.Project.Updater.FileVersion + 22 + + + Version + 22 + + diff --git a/softwareDirectory/AutoVerScheme/checkmethodmanage.ui b/softwareDirectory/AutoVerScheme/checkmethodmanage.ui index 648509b..da56d61 100644 --- a/softwareDirectory/AutoVerScheme/checkmethodmanage.ui +++ b/softwareDirectory/AutoVerScheme/checkmethodmanage.ui @@ -123,8 +123,7 @@ color: rgb(255, 255, 255); background-color: rgb(74, 102, 186); -border-radius:5px; -padding:10px 20px; +border-radius:5px; 查询 diff --git a/softwareDirectory/AutoVerScheme/checkwindow.cpp b/softwareDirectory/AutoVerScheme/checkwindow.cpp index 51650f9..da86ad4 100644 --- a/softwareDirectory/AutoVerScheme/checkwindow.cpp +++ b/softwareDirectory/AutoVerScheme/checkwindow.cpp @@ -9,12 +9,17 @@ ui(new Ui::CheckWindow) { ui->setupUi(this); - ui->tableWidgetDevice->setColumnCount(8); - ui->tableWidgetMethod->setColumnCount(7); + //ui->tableWidgetDevice->setColumnCount(8); + //ui->tableWidgetMethod->setColumnCount(7); + ui->tableWidgetDevice->verticalHeader()->setParent(nullptr); for(int i=2;i<8;i++) ui->tableWidgetDevice->horizontalHeader()->setSectionResizeMode(i,QHeaderView::Stretch); - for(int i=2;i<7;i++) + ui->tableWidgetMethod->verticalHeader()->setParent(nullptr); //隐藏行头 + for(int i=1;i<5;i++) ui->tableWidgetMethod->horizontalHeader()->setSectionResizeMode(i,QHeaderView::Stretch); + ui->tableWidgetMethod->setColumnWidth(0, 60); + ui->tableWidgetMethod->setColumnWidth(5, 100); + ui->tableWidget_3->verticalHeader()->setParent(nullptr); for(int i=0;i<2;i++) ui->tableWidget_3->horizontalHeader()->setSectionResizeMode(i,QHeaderView::Stretch); getCheckDevice(); @@ -24,12 +29,15 @@ CheckWindow::~CheckWindow() { + myTaskList.clear(); + programList.clear(); delete ui; } void CheckWindow::showMethod() { ui->stackedWidget->setCurrentIndex(1); + getCheckMethod(); } void CheckWindow::showDevice() @@ -46,6 +54,7 @@ { ui->stackedWidget_2->setCurrentIndex(0); ui->stackedWidget->setCurrentIndex(0); + getCheckDevice(); } void CheckWindow::showResult() @@ -57,18 +66,17 @@ void CheckWindow::getCheckDevice() { - - BaseCommonApi dbManager; - // 调用数据库管理器的函数获取数据 - + myTaskList.clear(); + ui->tableWidgetDevice->clearContents(); + ui->tableWidgetDevice->setRowCount(0); //模拟用户ID - QString userId="1640229293790650370"; - QList data = BaseCommonApi::getMyTasks(userId,"3"); + QString userId="1695282436182188034"; + myTaskList = BaseCommonApi::getMyTasks(userId,"3"); int rowCount = 0; int row=0; QString State; - for (const MyTask& myTask : data) { + for (const MyTask& myTask : myTaskList) { rowCount = ui->tableWidgetDevice->rowCount(); ui->tableWidgetDevice->insertRow(rowCount); @@ -87,3 +95,49 @@ row++; } } + +void CheckWindow::getCheckMethod() +{ + programList.clear(); + ui->tableWidgetMethod->clearContents(); + ui->tableWidgetMethod->setRowCount(0); + programList = BaseCommonApi::getVerificationProgramInfoMain(); + int rowCount = 0; + int row=0; + for (const VerificationProgramInfo& program : programList) { + rowCount = ui->tableWidgetMethod->rowCount(); + + ui->tableWidgetMethod->insertRow(rowCount); + QTableWidgetItem* p_check = new QTableWidgetItem(); + p_check->setCheckState(Qt::Unchecked); //设置首列为 CheckBox 控件 + ui->tableWidgetMethod->setItem(row,0,p_check); + ui->tableWidgetMethod->setItem(row, 1, new QTableWidgetItem(program.program_name)); //设置数据 + ui->tableWidgetMethod->setItem(row, 2, new QTableWidgetItem(program.create_name)); //设置数据 + ui->tableWidgetMethod->setItem(row, 3, new QTableWidgetItem(program.create_time.toString())); //设置数据 + ui->tableWidgetMethod->setItem(row, 4, new QTableWidgetItem(program.remark)); //设置数据 + + QPushButton *btn_1 = new QPushButton(); + btn_1->setText(tr("详情")); + btn_1->setStyleSheet("QPushButton{" + "background-color:rgba(255,255,255,0);" + "color:rgba(0,0,255,100);" + "text-decoration:underline;" + "}"); + btn_1->setCursor(Qt::PointingHandCursor); + connect(btn_1,SIGNAL(clicked()),this,SLOT(on_editButton_clicked())); + + btn_1->setIconSize(QSize(16,16)); + btn_1->setIcon(QIcon(":/image/Index/u2324.svg")); + QWidget *tmp_widget = new QWidget(); + QHBoxLayout *tmp_layout = new QHBoxLayout(tmp_widget); + tmp_layout->addWidget(btn_1); + tmp_layout->setMargin(0); + ui->tableWidgetMethod->setCellWidget(row,5,tmp_widget); + row++; + } +} + +void CheckWindow::on_editButton_clicked() +{ + +} diff --git a/softwareDirectory/AutoVerScheme/checkwindow.h b/softwareDirectory/AutoVerScheme/checkwindow.h index 005a85a..ea27646 100644 --- a/softwareDirectory/AutoVerScheme/checkwindow.h +++ b/softwareDirectory/AutoVerScheme/checkwindow.h @@ -2,6 +2,7 @@ #define CHECKWINDOW_H #include +#include "basecommonapi.h" namespace Ui { class CheckWindow; @@ -20,10 +21,14 @@ void showCheck(); void showMethodWidget(); void showResult(); + void on_editButton_clicked(); private: void getCheckDevice(); + void getCheckMethod(); private: Ui::CheckWindow *ui; + QList programList; + QList myTaskList; }; #endif // CHECKWINDOW_H diff --git a/softwareDirectory/AutoVerScheme/checkwindow.ui b/softwareDirectory/AutoVerScheme/checkwindow.ui index 20fbb81..1f7ef8c 100644 --- a/softwareDirectory/AutoVerScheme/checkwindow.ui +++ b/softwareDirectory/AutoVerScheme/checkwindow.ui @@ -598,11 +598,6 @@ - 序号 - - - - 检定程序名称 diff --git a/softwareDirectory/AutoVerScheme/formaddrsetting.cpp b/softwareDirectory/AutoVerScheme/formaddrsetting.cpp new file mode 100644 index 0000000..e0fb33a --- /dev/null +++ b/softwareDirectory/AutoVerScheme/formaddrsetting.cpp @@ -0,0 +1,14 @@ +#include "formaddrsetting.h" +#include "ui_formaddrsetting.h" + +FormAddrSetting::FormAddrSetting(QWidget *parent,int type,QString id) : + QWidget(parent), + ui(new Ui::FormAddrSetting) +{ + ui->setupUi(this); +} + +FormAddrSetting::~FormAddrSetting() +{ + delete ui; +} diff --git a/softwareDirectory/AutoVerScheme/formaddrsetting.h b/softwareDirectory/AutoVerScheme/formaddrsetting.h new file mode 100644 index 0000000..6392d44 --- /dev/null +++ b/softwareDirectory/AutoVerScheme/formaddrsetting.h @@ -0,0 +1,22 @@ +#ifndef FORMADDRSETTING_H +#define FORMADDRSETTING_H + +#include + +namespace Ui { +class FormAddrSetting; +} + +class FormAddrSetting : public QWidget +{ + Q_OBJECT + +public: + explicit FormAddrSetting(QWidget *parent = nullptr,int type=1,QString id=""); + ~FormAddrSetting(); + +private: + Ui::FormAddrSetting *ui; +}; + +#endif // FORMADDRSETTING_H diff --git a/softwareDirectory/AutoVerScheme/formaddrsetting.ui b/softwareDirectory/AutoVerScheme/formaddrsetting.ui new file mode 100644 index 0000000..9f73632 --- /dev/null +++ b/softwareDirectory/AutoVerScheme/formaddrsetting.ui @@ -0,0 +1,210 @@ + + + FormAddrSetting + + + + 0 + 0 + 1148 + 696 + + + + 设置通信命令 + + + background-color: rgb(242, 242, 242); + + + + + + 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); + + + 设置通信命令 + + + + + + + + + + + + + 20 + + + + + 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; + + + 新增 + + + + + + + + 1 + 0 + + + + + 72 + 26 + + + + + 12 + 75 + true + + + + color: rgb(255, 255, 255); +background-color: rgb(74, 102, 186); +border-radius:5px; + + + 删除 + + + + + + + + 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 + + + + + + + + + + + diff --git a/softwareDirectory/AutoVerScheme/formcheckpoint.cpp b/softwareDirectory/AutoVerScheme/formcheckpoint.cpp index 8053e94..cdc2e22 100644 --- a/softwareDirectory/AutoVerScheme/formcheckpoint.cpp +++ b/softwareDirectory/AutoVerScheme/formcheckpoint.cpp @@ -4,12 +4,13 @@ FormCheckPoint::FormCheckPoint(QWidget *parent,QString sId) : QWidget(parent), + checkId(sId), ui(new Ui::FormCheckPoint) { ui->setupUi(this); - if(sId!="") + if(checkId!="") { - + updateTable(checkId); } } @@ -17,3 +18,45 @@ { delete ui; } + +void FormCheckPoint::updateTable(QString id) +{ + //获取核查点tablewight的数据 + QStringList headlist; + + QList Data=BaseCommonApi::Search_CalibrationTable(id,&headlist); + + //tableWidgetItem + ui->tableWidget->setRowCount(0); + ui->tableWidget->setColumnCount(headlist.count()); + ui->tableWidget->setHorizontalHeaderLabels(headlist); + ui->tableWidget->verticalHeader()->setParent(nullptr); //隐藏行头 + for(int i=0;itableWidget->horizontalHeader()->setSectionResizeMode(i,QHeaderView::Stretch); + } + //循环数据 + int rowCount=0; + int row=0; + for (const QStringList& item : Data) + { + //获取行号 并进行添加行 + rowCount = ui->tableWidget->rowCount(); + ui->tableWidget->insertRow(rowCount); + //添加 序号 + ui->tableWidget->setItem(row, 0, new QTableWidgetItem(QString::number(row+1))); + //循环读取值 headlist，count是列的数量 + for(int i=1;itableWidget->setItem(row, i, new QTableWidgetItem(item[i])); + } + + row++; + + } +} + +void FormCheckPoint::on_pushButton_14_clicked() +{ + this->close(); +} diff --git a/softwareDirectory/AutoVerScheme/formcheckpoint.h b/softwareDirectory/AutoVerScheme/formcheckpoint.h index b54434b..3cbcd8e 100644 --- a/softwareDirectory/AutoVerScheme/formcheckpoint.h +++ b/softwareDirectory/AutoVerScheme/formcheckpoint.h @@ -12,11 +12,16 @@ Q_OBJECT public: - explicit FormCheckPoint(QWidget *parent = nullptr,QString checkId=""); + explicit FormCheckPoint(QWidget *parent = nullptr,QString sId=""); ~FormCheckPoint(); +private slots: + void on_pushButton_14_clicked(); private: + void updateTable(QString id); +private: Ui::FormCheckPoint *ui; + QString checkId=""; }; #endif // FORMCHECKPOINT_H diff --git a/softwareDirectory/AutoVerScheme/formcommsetting.cpp b/softwareDirectory/AutoVerScheme/formcommsetting.cpp new file mode 100644 index 0000000..26d7cb6 --- /dev/null +++ b/softwareDirectory/AutoVerScheme/formcommsetting.cpp @@ -0,0 +1,14 @@ +#include "formcommsetting.h" +#include "ui_formcommsetting.h" + +FormCommSetting::FormCommSetting(QWidget *parent,int type,QString id) : + QWidget(parent), + ui(new Ui::FormCommSetting) +{ + ui->setupUi(this); +} + +FormCommSetting::~FormCommSetting() +{ + delete ui; +} diff --git a/softwareDirectory/AutoVerScheme/AutoVerScheme.pro b/softwareDirectory/AutoVerScheme/AutoVerScheme.pro index 7864245..b84a377 100644 --- a/softwareDirectory/AutoVerScheme/AutoVerScheme.pro +++ b/softwareDirectory/AutoVerScheme/AutoVerScheme.pro @@ -31,7 +31,9 @@ depar_task.cpp \ depar_task_server.cpp \ dialogcheckresult.cpp \ + formaddrsetting.cpp \ formcheckpoint.cpp \ + formcommsetting.cpp \ formverypoint.cpp \ indexwindow.cpp \ infomanageview.cpp \ @@ -53,6 +55,8 @@ wordengine.cpp HEADERS += \ + formaddrsetting.h \ + formcommsetting.h \ id/IdWorker.h \ id/Noncopyable.h \ id/Singleton.h \ @@ -102,7 +106,9 @@ datasyncview.ui \ depar_task.ui \ dialogcheckresult.ui \ + formaddrsetting.ui \ formcheckpoint.ui \ + formcommsetting.ui \ formverypoint.ui \ indexwindow.ui \ infomanageview.ui \ diff --git a/softwareDirectory/AutoVerScheme/AutoVerScheme.pro.user b/softwareDirectory/AutoVerScheme/AutoVerScheme.pro.user new file mode 100644 index 0000000..2ced4d3 --- /dev/null +++ b/softwareDirectory/AutoVerScheme/AutoVerScheme.pro.user @@ -0,0 +1,562 @@ + + + + + + EnvironmentId + {2746248a-b112-4e0f-9ae0-9e61f2a42309} + + + ProjectExplorer.Project.ActiveTarget + 0 + + + ProjectExplorer.Project.EditorSettings + + true + false + true + + Cpp + + CppGlobal + + + + QmlJS + + QmlJSGlobal + + + 2 + UTF-8 + false + 4 + false + 80 + true + true + 1 + true + false + 0 + true + true + 0 + 8 + true + 1 + true + true + true + false + + + + ProjectExplorer.Project.PluginSettings + + + -fno-delayed-template-parsing + + true + + + + ProjectExplorer.Project.Target.0 + + Desktop Qt 5.14.2 MinGW 64-bit + Desktop Qt 5.14.2 MinGW 64-bit + qt.qt5.5142.win64_mingw73_kit + 0 + 0 + 0 + + D:/dev/software/softwareDirectory/build-AutoVerScheme-Desktop_Qt_5_14_2_MinGW_64_bit-Debug + + + true + QtProjectManager.QMakeBuildStep + true + + false + false + false + + + true + Qt4ProjectManager.MakeStep + + false + + + false + + 2 + Build + Build + ProjectExplorer.BuildSteps.Build + + + + true + Qt4ProjectManager.MakeStep + + true + clean + + false + + 1 + Clean + Clean + ProjectExplorer.BuildSteps.Clean + + 2 + false + + Debug + Qt4ProjectManager.Qt4BuildConfiguration + 2 + + + D:/dev/software/softwareDirectory/build-AutoVerScheme-Desktop_Qt_5_14_2_MinGW_64_bit-Release + + + true + QtProjectManager.QMakeBuildStep + false + + false + false + true + + + true + Qt4ProjectManager.MakeStep + + false + + + false + + 2 + Build + Build + ProjectExplorer.BuildSteps.Build + + + + true + Qt4ProjectManager.MakeStep + + true + clean + + false + + 1 + Clean + Clean + ProjectExplorer.BuildSteps.Clean + + 2 + false + + Release + Qt4ProjectManager.Qt4BuildConfiguration + 0 + + + D:/dev/software/softwareDirectory/build-AutoVerScheme-Desktop_Qt_5_14_2_MinGW_64_bit-Profile + + + true + QtProjectManager.QMakeBuildStep + true + + false + true + true + + + true + Qt4ProjectManager.MakeStep + + false + + + false + + 2 + Build + Build + ProjectExplorer.BuildSteps.Build + + + + true + Qt4ProjectManager.MakeStep + + true + clean + + false + + 1 + Clean + Clean + ProjectExplorer.BuildSteps.Clean + + 2 + false + + Profile + Qt4ProjectManager.Qt4BuildConfiguration + 0 + + 3 + + + 0 + Deploy + Deploy + ProjectExplorer.BuildSteps.Deploy + + 1 + ProjectExplorer.DefaultDeployConfiguration + + 1 + + + dwarf + + cpu-cycles + + + 250 + + -e + cpu-cycles + --call-graph + dwarf,4096 + -F + 250 + + -F + true + 4096 + false + false + 1000 + + true + + false + false + false + false + true + 0.01 + 10 + true + kcachegrind + 1 + 25 + + 1 + true + false + true + valgrind + + 0 + 1 + 2 + 3 + 4 + 5 + 6 + 7 + 8 + 9 + 10 + 11 + 12 + 13 + 14 + + 2 + + Qt4ProjectManager.Qt4RunConfiguration:D:/dev/software/softwareDirectory/AutoVerScheme/AutoVerScheme.pro + D:/dev/software/softwareDirectory/AutoVerScheme/AutoVerScheme.pro + + false + + false + true + true + false + false + true + + D:/dev/software/softwareDirectory/build-AutoVerScheme-Desktop_Qt_5_14_2_MinGW_64_bit-Debug + + 1 + + + + ProjectExplorer.Project.Target.1 + + Desktop Qt 5.14.2 MinGW 32-bit + Desktop Qt 5.14.2 MinGW 32-bit + qt.qt5.5142.win32_mingw73_kit + 0 + 0 + 0 + + D:/dev/software/softwareDirectory/build-AutoVerScheme-Desktop_Qt_5_14_2_MinGW_32_bit-Debug + + + true + QtProjectManager.QMakeBuildStep + true + + false + false + false + + + true + Qt4ProjectManager.MakeStep + + false + + + false + + 2 + Build + Build + ProjectExplorer.BuildSteps.Build + + + + true + Qt4ProjectManager.MakeStep + + true + clean + + false + + 1 + Clean + Clean + ProjectExplorer.BuildSteps.Clean + + 2 + false + + Debug + Qt4ProjectManager.Qt4BuildConfiguration + 2 + + + D:/dev/software/softwareDirectory/build-AutoVerScheme-Desktop_Qt_5_14_2_MinGW_32_bit-Release + + + true + QtProjectManager.QMakeBuildStep + false + + false + false + true + + + true + Qt4ProjectManager.MakeStep + + false + + + false + + 2 + Build + Build + ProjectExplorer.BuildSteps.Build + + + + true + Qt4ProjectManager.MakeStep + + true + clean + + false + + 1 + Clean + Clean + ProjectExplorer.BuildSteps.Clean + + 2 + false + + Release + Qt4ProjectManager.Qt4BuildConfiguration + 0 + + + D:/dev/software/softwareDirectory/build-AutoVerScheme-Desktop_Qt_5_14_2_MinGW_32_bit-Profile + + + true + QtProjectManager.QMakeBuildStep + true + + false + true + true + + + true + Qt4ProjectManager.MakeStep + + false + + + false + + 2 + Build + Build + ProjectExplorer.BuildSteps.Build + + + + true + Qt4ProjectManager.MakeStep + + true + clean + + false + + 1 + Clean + Clean + ProjectExplorer.BuildSteps.Clean + + 2 + false + + Profile + Qt4ProjectManager.Qt4BuildConfiguration + 0 + + 3 + + + 0 + Deploy + Deploy + ProjectExplorer.BuildSteps.Deploy + + 1 + ProjectExplorer.DefaultDeployConfiguration + + 1 + + + dwarf + + cpu-cycles + + + 250 + + -e + cpu-cycles + --call-graph + dwarf,4096 + -F + 250 + + -F + true + 4096 + false + false + 1000 + + true + + false + false + false + false + true + 0.01 + 10 + true + kcachegrind + 1 + 25 + + 1 + true + false + true + valgrind + + 0 + 1 + 2 + 3 + 4 + 5 + 6 + 7 + 8 + 9 + 10 + 11 + 12 + 13 + 14 + + 2 + + Qt4ProjectManager.Qt4RunConfiguration:D:/dev/software/softwareDirectory/AutoVerScheme/AutoVerScheme.pro + D:/dev/software/softwareDirectory/AutoVerScheme/AutoVerScheme.pro + + false + + false + true + true + false + false + true + + + + 1 + + + + ProjectExplorer.Project.TargetCount + 2 + + + ProjectExplorer.Project.Updater.FileVersion + 22 + + + Version + 22 + + diff --git a/softwareDirectory/AutoVerScheme/checkmethodmanage.ui b/softwareDirectory/AutoVerScheme/checkmethodmanage.ui index 648509b..da56d61 100644 --- a/softwareDirectory/AutoVerScheme/checkmethodmanage.ui +++ b/softwareDirectory/AutoVerScheme/checkmethodmanage.ui @@ -123,8 +123,7 @@ color: rgb(255, 255, 255); background-color: rgb(74, 102, 186); -border-radius:5px; -padding:10px 20px; +border-radius:5px; 查询 diff --git a/softwareDirectory/AutoVerScheme/checkwindow.cpp b/softwareDirectory/AutoVerScheme/checkwindow.cpp index 51650f9..da86ad4 100644 --- a/softwareDirectory/AutoVerScheme/checkwindow.cpp +++ b/softwareDirectory/AutoVerScheme/checkwindow.cpp @@ -9,12 +9,17 @@ ui(new Ui::CheckWindow) { ui->setupUi(this); - ui->tableWidgetDevice->setColumnCount(8); - ui->tableWidgetMethod->setColumnCount(7); + //ui->tableWidgetDevice->setColumnCount(8); + //ui->tableWidgetMethod->setColumnCount(7); + ui->tableWidgetDevice->verticalHeader()->setParent(nullptr); for(int i=2;i<8;i++) ui->tableWidgetDevice->horizontalHeader()->setSectionResizeMode(i,QHeaderView::Stretch); - for(int i=2;i<7;i++) + ui->tableWidgetMethod->verticalHeader()->setParent(nullptr); //隐藏行头 + for(int i=1;i<5;i++) ui->tableWidgetMethod->horizontalHeader()->setSectionResizeMode(i,QHeaderView::Stretch); + ui->tableWidgetMethod->setColumnWidth(0, 60); + ui->tableWidgetMethod->setColumnWidth(5, 100); + ui->tableWidget_3->verticalHeader()->setParent(nullptr); for(int i=0;i<2;i++) ui->tableWidget_3->horizontalHeader()->setSectionResizeMode(i,QHeaderView::Stretch); getCheckDevice(); @@ -24,12 +29,15 @@ CheckWindow::~CheckWindow() { + myTaskList.clear(); + programList.clear(); delete ui; } void CheckWindow::showMethod() { ui->stackedWidget->setCurrentIndex(1); + getCheckMethod(); } void CheckWindow::showDevice() @@ -46,6 +54,7 @@ { ui->stackedWidget_2->setCurrentIndex(0); ui->stackedWidget->setCurrentIndex(0); + getCheckDevice(); } void CheckWindow::showResult() @@ -57,18 +66,17 @@ void CheckWindow::getCheckDevice() { - - BaseCommonApi dbManager; - // 调用数据库管理器的函数获取数据 - + myTaskList.clear(); + ui->tableWidgetDevice->clearContents(); + ui->tableWidgetDevice->setRowCount(0); //模拟用户ID - QString userId="1640229293790650370"; - QList data = BaseCommonApi::getMyTasks(userId,"3"); + QString userId="1695282436182188034"; + myTaskList = BaseCommonApi::getMyTasks(userId,"3"); int rowCount = 0; int row=0; QString State; - for (const MyTask& myTask : data) { + for (const MyTask& myTask : myTaskList) { rowCount = ui->tableWidgetDevice->rowCount(); ui->tableWidgetDevice->insertRow(rowCount); @@ -87,3 +95,49 @@ row++; } } + +void CheckWindow::getCheckMethod() +{ + programList.clear(); + ui->tableWidgetMethod->clearContents(); + ui->tableWidgetMethod->setRowCount(0); + programList = BaseCommonApi::getVerificationProgramInfoMain(); + int rowCount = 0; + int row=0; + for (const VerificationProgramInfo& program : programList) { + rowCount = ui->tableWidgetMethod->rowCount(); + + ui->tableWidgetMethod->insertRow(rowCount); + QTableWidgetItem* p_check = new QTableWidgetItem(); + p_check->setCheckState(Qt::Unchecked); //设置首列为 CheckBox 控件 + ui->tableWidgetMethod->setItem(row,0,p_check); + ui->tableWidgetMethod->setItem(row, 1, new QTableWidgetItem(program.program_name)); //设置数据 + ui->tableWidgetMethod->setItem(row, 2, new QTableWidgetItem(program.create_name)); //设置数据 + ui->tableWidgetMethod->setItem(row, 3, new QTableWidgetItem(program.create_time.toString())); //设置数据 + ui->tableWidgetMethod->setItem(row, 4, new QTableWidgetItem(program.remark)); //设置数据 + + QPushButton *btn_1 = new QPushButton(); + btn_1->setText(tr("详情")); + btn_1->setStyleSheet("QPushButton{" + "background-color:rgba(255,255,255,0);" + "color:rgba(0,0,255,100);" + "text-decoration:underline;" + "}"); + btn_1->setCursor(Qt::PointingHandCursor); + connect(btn_1,SIGNAL(clicked()),this,SLOT(on_editButton_clicked())); + + btn_1->setIconSize(QSize(16,16)); + btn_1->setIcon(QIcon(":/image/Index/u2324.svg")); + QWidget *tmp_widget = new QWidget(); + QHBoxLayout *tmp_layout = new QHBoxLayout(tmp_widget); + tmp_layout->addWidget(btn_1); + tmp_layout->setMargin(0); + ui->tableWidgetMethod->setCellWidget(row,5,tmp_widget); + row++; + } +} + +void CheckWindow::on_editButton_clicked() +{ + +} diff --git a/softwareDirectory/AutoVerScheme/checkwindow.h b/softwareDirectory/AutoVerScheme/checkwindow.h index 005a85a..ea27646 100644 --- a/softwareDirectory/AutoVerScheme/checkwindow.h +++ b/softwareDirectory/AutoVerScheme/checkwindow.h @@ -2,6 +2,7 @@ #define CHECKWINDOW_H #include +#include "basecommonapi.h" namespace Ui { class CheckWindow; @@ -20,10 +21,14 @@ void showCheck(); void showMethodWidget(); void showResult(); + void on_editButton_clicked(); private: void getCheckDevice(); + void getCheckMethod(); private: Ui::CheckWindow *ui; + QList programList; + QList myTaskList; }; #endif // CHECKWINDOW_H diff --git a/softwareDirectory/AutoVerScheme/checkwindow.ui b/softwareDirectory/AutoVerScheme/checkwindow.ui index 20fbb81..1f7ef8c 100644 --- a/softwareDirectory/AutoVerScheme/checkwindow.ui +++ b/softwareDirectory/AutoVerScheme/checkwindow.ui @@ -598,11 +598,6 @@ - 序号 - - - - 检定程序名称 diff --git a/softwareDirectory/AutoVerScheme/formaddrsetting.cpp b/softwareDirectory/AutoVerScheme/formaddrsetting.cpp new file mode 100644 index 0000000..e0fb33a --- /dev/null +++ b/softwareDirectory/AutoVerScheme/formaddrsetting.cpp @@ -0,0 +1,14 @@ +#include "formaddrsetting.h" +#include "ui_formaddrsetting.h" + +FormAddrSetting::FormAddrSetting(QWidget *parent,int type,QString id) : + QWidget(parent), + ui(new Ui::FormAddrSetting) +{ + ui->setupUi(this); +} + +FormAddrSetting::~FormAddrSetting() +{ + delete ui; +} diff --git a/softwareDirectory/AutoVerScheme/formaddrsetting.h b/softwareDirectory/AutoVerScheme/formaddrsetting.h new file mode 100644 index 0000000..6392d44 --- /dev/null +++ b/softwareDirectory/AutoVerScheme/formaddrsetting.h @@ -0,0 +1,22 @@ +#ifndef FORMADDRSETTING_H +#define FORMADDRSETTING_H + +#include + +namespace Ui { +class FormAddrSetting; +} + +class FormAddrSetting : public QWidget +{ + Q_OBJECT + +public: + explicit FormAddrSetting(QWidget *parent = nullptr,int type=1,QString id=""); + ~FormAddrSetting(); + +private: + Ui::FormAddrSetting *ui; +}; + +#endif // FORMADDRSETTING_H diff --git a/softwareDirectory/AutoVerScheme/formaddrsetting.ui b/softwareDirectory/AutoVerScheme/formaddrsetting.ui new file mode 100644 index 0000000..9f73632 --- /dev/null +++ b/softwareDirectory/AutoVerScheme/formaddrsetting.ui @@ -0,0 +1,210 @@ + + + FormAddrSetting + + + + 0 + 0 + 1148 + 696 + + + + 设置通信命令 + + + background-color: rgb(242, 242, 242); + + + + + + 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); + + + 设置通信命令 + + + + + + + + + + + + + 20 + + + + + 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; + + + 新增 + + + + + + + + 1 + 0 + + + + + 72 + 26 + + + + + 12 + 75 + true + + + + color: rgb(255, 255, 255); +background-color: rgb(74, 102, 186); +border-radius:5px; + + + 删除 + + + + + + + + 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 + + + + + + + + + + + diff --git a/softwareDirectory/AutoVerScheme/formcheckpoint.cpp b/softwareDirectory/AutoVerScheme/formcheckpoint.cpp index 8053e94..cdc2e22 100644 --- a/softwareDirectory/AutoVerScheme/formcheckpoint.cpp +++ b/softwareDirectory/AutoVerScheme/formcheckpoint.cpp @@ -4,12 +4,13 @@ FormCheckPoint::FormCheckPoint(QWidget *parent,QString sId) : QWidget(parent), + checkId(sId), ui(new Ui::FormCheckPoint) { ui->setupUi(this); - if(sId!="") + if(checkId!="") { - + updateTable(checkId); } } @@ -17,3 +18,45 @@ { delete ui; } + +void FormCheckPoint::updateTable(QString id) +{ + //获取核查点tablewight的数据 + QStringList headlist; + + QList Data=BaseCommonApi::Search_CalibrationTable(id,&headlist); + + //tableWidgetItem + ui->tableWidget->setRowCount(0); + ui->tableWidget->setColumnCount(headlist.count()); + ui->tableWidget->setHorizontalHeaderLabels(headlist); + ui->tableWidget->verticalHeader()->setParent(nullptr); //隐藏行头 + for(int i=0;itableWidget->horizontalHeader()->setSectionResizeMode(i,QHeaderView::Stretch); + } + //循环数据 + int rowCount=0; + int row=0; + for (const QStringList& item : Data) + { + //获取行号 并进行添加行 + rowCount = ui->tableWidget->rowCount(); + ui->tableWidget->insertRow(rowCount); + //添加 序号 + ui->tableWidget->setItem(row, 0, new QTableWidgetItem(QString::number(row+1))); + //循环读取值 headlist，count是列的数量 + for(int i=1;itableWidget->setItem(row, i, new QTableWidgetItem(item[i])); + } + + row++; + + } +} + +void FormCheckPoint::on_pushButton_14_clicked() +{ + this->close(); +} diff --git a/softwareDirectory/AutoVerScheme/formcheckpoint.h b/softwareDirectory/AutoVerScheme/formcheckpoint.h index b54434b..3cbcd8e 100644 --- a/softwareDirectory/AutoVerScheme/formcheckpoint.h +++ b/softwareDirectory/AutoVerScheme/formcheckpoint.h @@ -12,11 +12,16 @@ Q_OBJECT public: - explicit FormCheckPoint(QWidget *parent = nullptr,QString checkId=""); + explicit FormCheckPoint(QWidget *parent = nullptr,QString sId=""); ~FormCheckPoint(); +private slots: + void on_pushButton_14_clicked(); private: + void updateTable(QString id); +private: Ui::FormCheckPoint *ui; + QString checkId=""; }; #endif // FORMCHECKPOINT_H diff --git a/softwareDirectory/AutoVerScheme/formcommsetting.cpp b/softwareDirectory/AutoVerScheme/formcommsetting.cpp new file mode 100644 index 0000000..26d7cb6 --- /dev/null +++ b/softwareDirectory/AutoVerScheme/formcommsetting.cpp @@ -0,0 +1,14 @@ +#include "formcommsetting.h" +#include "ui_formcommsetting.h" + +FormCommSetting::FormCommSetting(QWidget *parent,int type,QString id) : + QWidget(parent), + ui(new Ui::FormCommSetting) +{ + ui->setupUi(this); +} + +FormCommSetting::~FormCommSetting() +{ + delete ui; +} diff --git a/softwareDirectory/AutoVerScheme/formcommsetting.h b/softwareDirectory/AutoVerScheme/formcommsetting.h new file mode 100644 index 0000000..40cdb59 --- /dev/null +++ b/softwareDirectory/AutoVerScheme/formcommsetting.h @@ -0,0 +1,22 @@ +#ifndef FORMCOMMSETTING_H +#define FORMCOMMSETTING_H + +#include + +namespace Ui { +class FormCommSetting; +} + +class FormCommSetting : public QWidget +{ + Q_OBJECT + +public: + explicit FormCommSetting(QWidget *parent = nullptr,int type=1,QString id=""); + ~FormCommSetting(); + +private: + Ui::FormCommSetting *ui; +}; + +#endif // FORMCOMMSETTING_H diff --git a/softwareDirectory/AutoVerScheme/AutoVerScheme.pro b/softwareDirectory/AutoVerScheme/AutoVerScheme.pro index 7864245..b84a377 100644 --- a/softwareDirectory/AutoVerScheme/AutoVerScheme.pro +++ b/softwareDirectory/AutoVerScheme/AutoVerScheme.pro @@ -31,7 +31,9 @@ depar_task.cpp \ depar_task_server.cpp \ dialogcheckresult.cpp \ + formaddrsetting.cpp \ formcheckpoint.cpp \ + formcommsetting.cpp \ formverypoint.cpp \ indexwindow.cpp \ infomanageview.cpp \ @@ -53,6 +55,8 @@ wordengine.cpp HEADERS += \ + formaddrsetting.h \ + formcommsetting.h \ id/IdWorker.h \ id/Noncopyable.h \ id/Singleton.h \ @@ -102,7 +106,9 @@ datasyncview.ui \ depar_task.ui \ dialogcheckresult.ui \ + formaddrsetting.ui \ formcheckpoint.ui \ + formcommsetting.ui \ formverypoint.ui \ indexwindow.ui \ infomanageview.ui \ diff --git a/softwareDirectory/AutoVerScheme/AutoVerScheme.pro.user b/softwareDirectory/AutoVerScheme/AutoVerScheme.pro.user new file mode 100644 index 0000000..2ced4d3 --- /dev/null +++ b/softwareDirectory/AutoVerScheme/AutoVerScheme.pro.user @@ -0,0 +1,562 @@ + + + + + + EnvironmentId + {2746248a-b112-4e0f-9ae0-9e61f2a42309} + + + ProjectExplorer.Project.ActiveTarget + 0 + + + ProjectExplorer.Project.EditorSettings + + true + false + true + + Cpp + + CppGlobal + + + + QmlJS + + QmlJSGlobal + + + 2 + UTF-8 + false + 4 + false + 80 + true + true + 1 + true + false + 0 + true + true + 0 + 8 + true + 1 + true + true + true + false + + + + ProjectExplorer.Project.PluginSettings + + + -fno-delayed-template-parsing + + true + + + + ProjectExplorer.Project.Target.0 + + Desktop Qt 5.14.2 MinGW 64-bit + Desktop Qt 5.14.2 MinGW 64-bit + qt.qt5.5142.win64_mingw73_kit + 0 + 0 + 0 + + D:/dev/software/softwareDirectory/build-AutoVerScheme-Desktop_Qt_5_14_2_MinGW_64_bit-Debug + + + true + QtProjectManager.QMakeBuildStep + true + + false + false + false + + + true + Qt4ProjectManager.MakeStep + + false + + + false + + 2 + Build + Build + ProjectExplorer.BuildSteps.Build + + + + true + Qt4ProjectManager.MakeStep + + true + clean + + false + + 1 + Clean + Clean + ProjectExplorer.BuildSteps.Clean + + 2 + false + + Debug + Qt4ProjectManager.Qt4BuildConfiguration + 2 + + + D:/dev/software/softwareDirectory/build-AutoVerScheme-Desktop_Qt_5_14_2_MinGW_64_bit-Release + + + true + QtProjectManager.QMakeBuildStep + false + + false + false + true + + + true + Qt4ProjectManager.MakeStep + + false + + + false + + 2 + Build + Build + ProjectExplorer.BuildSteps.Build + + + + true + Qt4ProjectManager.MakeStep + + true + clean + + false + + 1 + Clean + Clean + ProjectExplorer.BuildSteps.Clean + + 2 + false + + Release + Qt4ProjectManager.Qt4BuildConfiguration + 0 + + + D:/dev/software/softwareDirectory/build-AutoVerScheme-Desktop_Qt_5_14_2_MinGW_64_bit-Profile + + + true + QtProjectManager.QMakeBuildStep + true + + false + true + true + + + true + Qt4ProjectManager.MakeStep + + false + + + false + + 2 + Build + Build + ProjectExplorer.BuildSteps.Build + + + + true + Qt4ProjectManager.MakeStep + + true + clean + + false + + 1 + Clean + Clean + ProjectExplorer.BuildSteps.Clean + + 2 + false + + Profile + Qt4ProjectManager.Qt4BuildConfiguration + 0 + + 3 + + + 0 + Deploy + Deploy + ProjectExplorer.BuildSteps.Deploy + + 1 + ProjectExplorer.DefaultDeployConfiguration + + 1 + + + dwarf + + cpu-cycles + + + 250 + + -e + cpu-cycles + --call-graph + dwarf,4096 + -F + 250 + + -F + true + 4096 + false + false + 1000 + + true + + false + false + false + false + true + 0.01 + 10 + true + kcachegrind + 1 + 25 + + 1 + true + false + true + valgrind + + 0 + 1 + 2 + 3 + 4 + 5 + 6 + 7 + 8 + 9 + 10 + 11 + 12 + 13 + 14 + + 2 + + Qt4ProjectManager.Qt4RunConfiguration:D:/dev/software/softwareDirectory/AutoVerScheme/AutoVerScheme.pro + D:/dev/software/softwareDirectory/AutoVerScheme/AutoVerScheme.pro + + false + + false + true + true + false + false + true + + D:/dev/software/softwareDirectory/build-AutoVerScheme-Desktop_Qt_5_14_2_MinGW_64_bit-Debug + + 1 + + + + ProjectExplorer.Project.Target.1 + + Desktop Qt 5.14.2 MinGW 32-bit + Desktop Qt 5.14.2 MinGW 32-bit + qt.qt5.5142.win32_mingw73_kit + 0 + 0 + 0 + + D:/dev/software/softwareDirectory/build-AutoVerScheme-Desktop_Qt_5_14_2_MinGW_32_bit-Debug + + + true + QtProjectManager.QMakeBuildStep + true + + false + false + false + + + true + Qt4ProjectManager.MakeStep + + false + + + false + + 2 + Build + Build + ProjectExplorer.BuildSteps.Build + + + + true + Qt4ProjectManager.MakeStep + + true + clean + + false + + 1 + Clean + Clean + ProjectExplorer.BuildSteps.Clean + + 2 + false + + Debug + Qt4ProjectManager.Qt4BuildConfiguration + 2 + + + D:/dev/software/softwareDirectory/build-AutoVerScheme-Desktop_Qt_5_14_2_MinGW_32_bit-Release + + + true + QtProjectManager.QMakeBuildStep + false + + false + false + true + + + true + Qt4ProjectManager.MakeStep + + false + + + false + + 2 + Build + Build + ProjectExplorer.BuildSteps.Build + + + + true + Qt4ProjectManager.MakeStep + + true + clean + + false + + 1 + Clean + Clean + ProjectExplorer.BuildSteps.Clean + + 2 + false + + Release + Qt4ProjectManager.Qt4BuildConfiguration + 0 + + + D:/dev/software/softwareDirectory/build-AutoVerScheme-Desktop_Qt_5_14_2_MinGW_32_bit-Profile + + + true + QtProjectManager.QMakeBuildStep + true + + false + true + true + + + true + Qt4ProjectManager.MakeStep + + false + + + false + + 2 + Build + Build + ProjectExplorer.BuildSteps.Build + + + + true + Qt4ProjectManager.MakeStep + + true + clean + + false + + 1 + Clean + Clean + ProjectExplorer.BuildSteps.Clean + + 2 + false + + Profile + Qt4ProjectManager.Qt4BuildConfiguration + 0 + + 3 + + + 0 + Deploy + Deploy + ProjectExplorer.BuildSteps.Deploy + + 1 + ProjectExplorer.DefaultDeployConfiguration + + 1 + + + dwarf + + cpu-cycles + + + 250 + + -e + cpu-cycles + --call-graph + dwarf,4096 + -F + 250 + + -F + true + 4096 + false + false + 1000 + + true + + false + false + false + false + true + 0.01 + 10 + true + kcachegrind + 1 + 25 + + 1 + true + false + true + valgrind + + 0 + 1 + 2 + 3 + 4 + 5 + 6 + 7 + 8 + 9 + 10 + 11 + 12 + 13 + 14 + + 2 + + Qt4ProjectManager.Qt4RunConfiguration:D:/dev/software/softwareDirectory/AutoVerScheme/AutoVerScheme.pro + D:/dev/software/softwareDirectory/AutoVerScheme/AutoVerScheme.pro + + false + + false + true + true + false + false + true + + + + 1 + + + + ProjectExplorer.Project.TargetCount + 2 + + + ProjectExplorer.Project.Updater.FileVersion + 22 + + + Version + 22 + + diff --git a/softwareDirectory/AutoVerScheme/checkmethodmanage.ui b/softwareDirectory/AutoVerScheme/checkmethodmanage.ui index 648509b..da56d61 100644 --- a/softwareDirectory/AutoVerScheme/checkmethodmanage.ui +++ b/softwareDirectory/AutoVerScheme/checkmethodmanage.ui @@ -123,8 +123,7 @@ color: rgb(255, 255, 255); background-color: rgb(74, 102, 186); -border-radius:5px; -padding:10px 20px; +border-radius:5px; 查询 diff --git a/softwareDirectory/AutoVerScheme/checkwindow.cpp b/softwareDirectory/AutoVerScheme/checkwindow.cpp index 51650f9..da86ad4 100644 --- a/softwareDirectory/AutoVerScheme/checkwindow.cpp +++ b/softwareDirectory/AutoVerScheme/checkwindow.cpp @@ -9,12 +9,17 @@ ui(new Ui::CheckWindow) { ui->setupUi(this); - ui->tableWidgetDevice->setColumnCount(8); - ui->tableWidgetMethod->setColumnCount(7); + //ui->tableWidgetDevice->setColumnCount(8); + //ui->tableWidgetMethod->setColumnCount(7); + ui->tableWidgetDevice->verticalHeader()->setParent(nullptr); for(int i=2;i<8;i++) ui->tableWidgetDevice->horizontalHeader()->setSectionResizeMode(i,QHeaderView::Stretch); - for(int i=2;i<7;i++) + ui->tableWidgetMethod->verticalHeader()->setParent(nullptr); //隐藏行头 + for(int i=1;i<5;i++) ui->tableWidgetMethod->horizontalHeader()->setSectionResizeMode(i,QHeaderView::Stretch); + ui->tableWidgetMethod->setColumnWidth(0, 60); + ui->tableWidgetMethod->setColumnWidth(5, 100); + ui->tableWidget_3->verticalHeader()->setParent(nullptr); for(int i=0;i<2;i++) ui->tableWidget_3->horizontalHeader()->setSectionResizeMode(i,QHeaderView::Stretch); getCheckDevice(); @@ -24,12 +29,15 @@ CheckWindow::~CheckWindow() { + myTaskList.clear(); + programList.clear(); delete ui; } void CheckWindow::showMethod() { ui->stackedWidget->setCurrentIndex(1); + getCheckMethod(); } void CheckWindow::showDevice() @@ -46,6 +54,7 @@ { ui->stackedWidget_2->setCurrentIndex(0); ui->stackedWidget->setCurrentIndex(0); + getCheckDevice(); } void CheckWindow::showResult() @@ -57,18 +66,17 @@ void CheckWindow::getCheckDevice() { - - BaseCommonApi dbManager; - // 调用数据库管理器的函数获取数据 - + myTaskList.clear(); + ui->tableWidgetDevice->clearContents(); + ui->tableWidgetDevice->setRowCount(0); //模拟用户ID - QString userId="1640229293790650370"; - QList data = BaseCommonApi::getMyTasks(userId,"3"); + QString userId="1695282436182188034"; + myTaskList = BaseCommonApi::getMyTasks(userId,"3"); int rowCount = 0; int row=0; QString State; - for (const MyTask& myTask : data) { + for (const MyTask& myTask : myTaskList) { rowCount = ui->tableWidgetDevice->rowCount(); ui->tableWidgetDevice->insertRow(rowCount); @@ -87,3 +95,49 @@ row++; } } + +void CheckWindow::getCheckMethod() +{ + programList.clear(); + ui->tableWidgetMethod->clearContents(); + ui->tableWidgetMethod->setRowCount(0); + programList = BaseCommonApi::getVerificationProgramInfoMain(); + int rowCount = 0; + int row=0; + for (const VerificationProgramInfo& program : programList) { + rowCount = ui->tableWidgetMethod->rowCount(); + + ui->tableWidgetMethod->insertRow(rowCount); + QTableWidgetItem* p_check = new QTableWidgetItem(); + p_check->setCheckState(Qt::Unchecked); //设置首列为 CheckBox 控件 + ui->tableWidgetMethod->setItem(row,0,p_check); + ui->tableWidgetMethod->setItem(row, 1, new QTableWidgetItem(program.program_name)); //设置数据 + ui->tableWidgetMethod->setItem(row, 2, new QTableWidgetItem(program.create_name)); //设置数据 + ui->tableWidgetMethod->setItem(row, 3, new QTableWidgetItem(program.create_time.toString())); //设置数据 + ui->tableWidgetMethod->setItem(row, 4, new QTableWidgetItem(program.remark)); //设置数据 + + QPushButton *btn_1 = new QPushButton(); + btn_1->setText(tr("详情")); + btn_1->setStyleSheet("QPushButton{" + "background-color:rgba(255,255,255,0);" + "color:rgba(0,0,255,100);" + "text-decoration:underline;" + "}"); + btn_1->setCursor(Qt::PointingHandCursor); + connect(btn_1,SIGNAL(clicked()),this,SLOT(on_editButton_clicked())); + + btn_1->setIconSize(QSize(16,16)); + btn_1->setIcon(QIcon(":/image/Index/u2324.svg")); + QWidget *tmp_widget = new QWidget(); + QHBoxLayout *tmp_layout = new QHBoxLayout(tmp_widget); + tmp_layout->addWidget(btn_1); + tmp_layout->setMargin(0); + ui->tableWidgetMethod->setCellWidget(row,5,tmp_widget); + row++; + } +} + +void CheckWindow::on_editButton_clicked() +{ + +} diff --git a/softwareDirectory/AutoVerScheme/checkwindow.h b/softwareDirectory/AutoVerScheme/checkwindow.h index 005a85a..ea27646 100644 --- a/softwareDirectory/AutoVerScheme/checkwindow.h +++ b/softwareDirectory/AutoVerScheme/checkwindow.h @@ -2,6 +2,7 @@ #define CHECKWINDOW_H #include +#include "basecommonapi.h" namespace Ui { class CheckWindow; @@ -20,10 +21,14 @@ void showCheck(); void showMethodWidget(); void showResult(); + void on_editButton_clicked(); private: void getCheckDevice(); + void getCheckMethod(); private: Ui::CheckWindow *ui; + QList programList; + QList myTaskList; }; #endif // CHECKWINDOW_H diff --git a/softwareDirectory/AutoVerScheme/checkwindow.ui b/softwareDirectory/AutoVerScheme/checkwindow.ui index 20fbb81..1f7ef8c 100644 --- a/softwareDirectory/AutoVerScheme/checkwindow.ui +++ b/softwareDirectory/AutoVerScheme/checkwindow.ui @@ -598,11 +598,6 @@ - 序号 - - - - 检定程序名称 diff --git a/softwareDirectory/AutoVerScheme/formaddrsetting.cpp b/softwareDirectory/AutoVerScheme/formaddrsetting.cpp new file mode 100644 index 0000000..e0fb33a --- /dev/null +++ b/softwareDirectory/AutoVerScheme/formaddrsetting.cpp @@ -0,0 +1,14 @@ +#include "formaddrsetting.h" +#include "ui_formaddrsetting.h" + +FormAddrSetting::FormAddrSetting(QWidget *parent,int type,QString id) : + QWidget(parent), + ui(new Ui::FormAddrSetting) +{ + ui->setupUi(this); +} + +FormAddrSetting::~FormAddrSetting() +{ + delete ui; +} diff --git a/softwareDirectory/AutoVerScheme/formaddrsetting.h b/softwareDirectory/AutoVerScheme/formaddrsetting.h new file mode 100644 index 0000000..6392d44 --- /dev/null +++ b/softwareDirectory/AutoVerScheme/formaddrsetting.h @@ -0,0 +1,22 @@ +#ifndef FORMADDRSETTING_H +#define FORMADDRSETTING_H + +#include + +namespace Ui { +class FormAddrSetting; +} + +class FormAddrSetting : public QWidget +{ + Q_OBJECT + +public: + explicit FormAddrSetting(QWidget *parent = nullptr,int type=1,QString id=""); + ~FormAddrSetting(); + +private: + Ui::FormAddrSetting *ui; +}; + +#endif // FORMADDRSETTING_H diff --git a/softwareDirectory/AutoVerScheme/formaddrsetting.ui b/softwareDirectory/AutoVerScheme/formaddrsetting.ui new file mode 100644 index 0000000..9f73632 --- /dev/null +++ b/softwareDirectory/AutoVerScheme/formaddrsetting.ui @@ -0,0 +1,210 @@ + + + FormAddrSetting + + + + 0 + 0 + 1148 + 696 + + + + 设置通信命令 + + + background-color: rgb(242, 242, 242); + + + + + + 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); + + + 设置通信命令 + + + + + + + + + + + + + 20 + + + + + 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; + + + 新增 + + + + + + + + 1 + 0 + + + + + 72 + 26 + + + + + 12 + 75 + true + + + + color: rgb(255, 255, 255); +background-color: rgb(74, 102, 186); +border-radius:5px; + + + 删除 + + + + + + + + 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 + + + + + + + + + + + diff --git a/softwareDirectory/AutoVerScheme/formcheckpoint.cpp b/softwareDirectory/AutoVerScheme/formcheckpoint.cpp index 8053e94..cdc2e22 100644 --- a/softwareDirectory/AutoVerScheme/formcheckpoint.cpp +++ b/softwareDirectory/AutoVerScheme/formcheckpoint.cpp @@ -4,12 +4,13 @@ FormCheckPoint::FormCheckPoint(QWidget *parent,QString sId) : QWidget(parent), + checkId(sId), ui(new Ui::FormCheckPoint) { ui->setupUi(this); - if(sId!="") + if(checkId!="") { - + updateTable(checkId); } } @@ -17,3 +18,45 @@ { delete ui; } + +void FormCheckPoint::updateTable(QString id) +{ + //获取核查点tablewight的数据 + QStringList headlist; + + QList Data=BaseCommonApi::Search_CalibrationTable(id,&headlist); + + //tableWidgetItem + ui->tableWidget->setRowCount(0); + ui->tableWidget->setColumnCount(headlist.count()); + ui->tableWidget->setHorizontalHeaderLabels(headlist); + ui->tableWidget->verticalHeader()->setParent(nullptr); //隐藏行头 + for(int i=0;itableWidget->horizontalHeader()->setSectionResizeMode(i,QHeaderView::Stretch); + } + //循环数据 + int rowCount=0; + int row=0; + for (const QStringList& item : Data) + { + //获取行号 并进行添加行 + rowCount = ui->tableWidget->rowCount(); + ui->tableWidget->insertRow(rowCount); + //添加 序号 + ui->tableWidget->setItem(row, 0, new QTableWidgetItem(QString::number(row+1))); + //循环读取值 headlist，count是列的数量 + for(int i=1;itableWidget->setItem(row, i, new QTableWidgetItem(item[i])); + } + + row++; + + } +} + +void FormCheckPoint::on_pushButton_14_clicked() +{ + this->close(); +} diff --git a/softwareDirectory/AutoVerScheme/formcheckpoint.h b/softwareDirectory/AutoVerScheme/formcheckpoint.h index b54434b..3cbcd8e 100644 --- a/softwareDirectory/AutoVerScheme/formcheckpoint.h +++ b/softwareDirectory/AutoVerScheme/formcheckpoint.h @@ -12,11 +12,16 @@ Q_OBJECT public: - explicit FormCheckPoint(QWidget *parent = nullptr,QString checkId=""); + explicit FormCheckPoint(QWidget *parent = nullptr,QString sId=""); ~FormCheckPoint(); +private slots: + void on_pushButton_14_clicked(); private: + void updateTable(QString id); +private: Ui::FormCheckPoint *ui; + QString checkId=""; }; #endif // FORMCHECKPOINT_H diff --git a/softwareDirectory/AutoVerScheme/formcommsetting.cpp b/softwareDirectory/AutoVerScheme/formcommsetting.cpp new file mode 100644 index 0000000..26d7cb6 --- /dev/null +++ b/softwareDirectory/AutoVerScheme/formcommsetting.cpp @@ -0,0 +1,14 @@ +#include "formcommsetting.h" +#include "ui_formcommsetting.h" + +FormCommSetting::FormCommSetting(QWidget *parent,int type,QString id) : + QWidget(parent), + ui(new Ui::FormCommSetting) +{ + ui->setupUi(this); +} + +FormCommSetting::~FormCommSetting() +{ + delete ui; +} diff --git a/softwareDirectory/AutoVerScheme/formcommsetting.h b/softwareDirectory/AutoVerScheme/formcommsetting.h new file mode 100644 index 0000000..40cdb59 --- /dev/null +++ b/softwareDirectory/AutoVerScheme/formcommsetting.h @@ -0,0 +1,22 @@ +#ifndef FORMCOMMSETTING_H +#define FORMCOMMSETTING_H + +#include + +namespace Ui { +class FormCommSetting; +} + +class FormCommSetting : public QWidget +{ + Q_OBJECT + +public: + explicit FormCommSetting(QWidget *parent = nullptr,int type=1,QString id=""); + ~FormCommSetting(); + +private: + Ui::FormCommSetting *ui; +}; + +#endif // FORMCOMMSETTING_H diff --git a/softwareDirectory/AutoVerScheme/formcommsetting.ui b/softwareDirectory/AutoVerScheme/formcommsetting.ui new file mode 100644 index 0000000..35ab9d1 --- /dev/null +++ b/softwareDirectory/AutoVerScheme/formcommsetting.ui @@ -0,0 +1,418 @@ + + + FormCommSetting + + + + 0 + 0 + 1148 + 696 + + + + 设置设备接口 + + + background-color: rgb(242, 242, 242); + + + + + + 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); + + + 设置设备接口 + + + + + + + + + + background-color: rgb(255, 255, 255); + + + + 6 + + + 12 + + + + + + 12 + + + + 串口 + + + + + + + + 12 + + + + 端口号: + + + + + + + + 12 + + + + + + + + + 12 + + + + 设备地址: + + + + + + + + 12 + + + + + + + + + 12 + + + + 波特率: + + + + + + + + 12 + + + + + + + + + 12 + + + + 校验位: + + + + + + + + 12 + + + + + + + + + 12 + + + + 数据位: + + + + + + + + 12 + + + + + + + + + 12 + + + + 停止位: + + + + + + + + 12 + + + + + + + + + 12 + + + + 模式: + + + + + + + + 12 + + + + + + + + + 12 + + + + 流控: + + + + + + + + 12 + + + + + + + + + + + background-color: rgb(255, 255, 255); + + + + + + + 12 + + + + VISA + + + + + + + 12 + + + + + + 12 + + + + 设备地址: + + + + + + + + 400 + 0 + + + + + 12 + + + + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + + + + + + + + Qt::Vertical + + + + 20 + 373 + + + + + + + + + + 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 + + + + + + + + + + + diff --git a/softwareDirectory/AutoVerScheme/AutoVerScheme.pro b/softwareDirectory/AutoVerScheme/AutoVerScheme.pro index 7864245..b84a377 100644 --- a/softwareDirectory/AutoVerScheme/AutoVerScheme.pro +++ b/softwareDirectory/AutoVerScheme/AutoVerScheme.pro @@ -31,7 +31,9 @@ depar_task.cpp \ depar_task_server.cpp \ dialogcheckresult.cpp \ + formaddrsetting.cpp \ formcheckpoint.cpp \ + formcommsetting.cpp \ formverypoint.cpp \ indexwindow.cpp \ infomanageview.cpp \ @@ -53,6 +55,8 @@ wordengine.cpp HEADERS += \ + formaddrsetting.h \ + formcommsetting.h \ id/IdWorker.h \ id/Noncopyable.h \ id/Singleton.h \ @@ -102,7 +106,9 @@ datasyncview.ui \ depar_task.ui \ dialogcheckresult.ui \ + formaddrsetting.ui \ formcheckpoint.ui \ + formcommsetting.ui \ formverypoint.ui \ indexwindow.ui \ infomanageview.ui \ diff --git a/softwareDirectory/AutoVerScheme/AutoVerScheme.pro.user b/softwareDirectory/AutoVerScheme/AutoVerScheme.pro.user new file mode 100644 index 0000000..2ced4d3 --- /dev/null +++ b/softwareDirectory/AutoVerScheme/AutoVerScheme.pro.user @@ -0,0 +1,562 @@ + + + + + + EnvironmentId + {2746248a-b112-4e0f-9ae0-9e61f2a42309} + + + ProjectExplorer.Project.ActiveTarget + 0 + + + ProjectExplorer.Project.EditorSettings + + true + false + true + + Cpp + + CppGlobal + + + + QmlJS + + QmlJSGlobal + + + 2 + UTF-8 + false + 4 + false + 80 + true + true + 1 + true + false + 0 + true + true + 0 + 8 + true + 1 + true + true + true + false + + + + ProjectExplorer.Project.PluginSettings + + + -fno-delayed-template-parsing + + true + + + + ProjectExplorer.Project.Target.0 + + Desktop Qt 5.14.2 MinGW 64-bit + Desktop Qt 5.14.2 MinGW 64-bit + qt.qt5.5142.win64_mingw73_kit + 0 + 0 + 0 + + D:/dev/software/softwareDirectory/build-AutoVerScheme-Desktop_Qt_5_14_2_MinGW_64_bit-Debug + + + true + QtProjectManager.QMakeBuildStep + true + + false + false + false + + + true + Qt4ProjectManager.MakeStep + + false + + + false + + 2 + Build + Build + ProjectExplorer.BuildSteps.Build + + + + true + Qt4ProjectManager.MakeStep + + true + clean + + false + + 1 + Clean + Clean + ProjectExplorer.BuildSteps.Clean + + 2 + false + + Debug + Qt4ProjectManager.Qt4BuildConfiguration + 2 + + + D:/dev/software/softwareDirectory/build-AutoVerScheme-Desktop_Qt_5_14_2_MinGW_64_bit-Release + + + true + QtProjectManager.QMakeBuildStep + false + + false + false + true + + + true + Qt4ProjectManager.MakeStep + + false + + + false + + 2 + Build + Build + ProjectExplorer.BuildSteps.Build + + + + true + Qt4ProjectManager.MakeStep + + true + clean + + false + + 1 + Clean + Clean + ProjectExplorer.BuildSteps.Clean + + 2 + false + + Release + Qt4ProjectManager.Qt4BuildConfiguration + 0 + + + D:/dev/software/softwareDirectory/build-AutoVerScheme-Desktop_Qt_5_14_2_MinGW_64_bit-Profile + + + true + QtProjectManager.QMakeBuildStep + true + + false + true + true + + + true + Qt4ProjectManager.MakeStep + + false + + + false + + 2 + Build + Build + ProjectExplorer.BuildSteps.Build + + + + true + Qt4ProjectManager.MakeStep + + true + clean + + false + + 1 + Clean + Clean + ProjectExplorer.BuildSteps.Clean + + 2 + false + + Profile + Qt4ProjectManager.Qt4BuildConfiguration + 0 + + 3 + + + 0 + Deploy + Deploy + ProjectExplorer.BuildSteps.Deploy + + 1 + ProjectExplorer.DefaultDeployConfiguration + + 1 + + + dwarf + + cpu-cycles + + + 250 + + -e + cpu-cycles + --call-graph + dwarf,4096 + -F + 250 + + -F + true + 4096 + false + false + 1000 + + true + + false + false + false + false + true + 0.01 + 10 + true + kcachegrind + 1 + 25 + + 1 + true + false + true + valgrind + + 0 + 1 + 2 + 3 + 4 + 5 + 6 + 7 + 8 + 9 + 10 + 11 + 12 + 13 + 14 + + 2 + + Qt4ProjectManager.Qt4RunConfiguration:D:/dev/software/softwareDirectory/AutoVerScheme/AutoVerScheme.pro + D:/dev/software/softwareDirectory/AutoVerScheme/AutoVerScheme.pro + + false + + false + true + true + false + false + true + + D:/dev/software/softwareDirectory/build-AutoVerScheme-Desktop_Qt_5_14_2_MinGW_64_bit-Debug + + 1 + + + + ProjectExplorer.Project.Target.1 + + Desktop Qt 5.14.2 MinGW 32-bit + Desktop Qt 5.14.2 MinGW 32-bit + qt.qt5.5142.win32_mingw73_kit + 0 + 0 + 0 + + D:/dev/software/softwareDirectory/build-AutoVerScheme-Desktop_Qt_5_14_2_MinGW_32_bit-Debug + + + true + QtProjectManager.QMakeBuildStep + true + + false + false + false + + + true + Qt4ProjectManager.MakeStep + + false + + + false + + 2 + Build + Build + ProjectExplorer.BuildSteps.Build + + + + true + Qt4ProjectManager.MakeStep + + true + clean + + false + + 1 + Clean + Clean + ProjectExplorer.BuildSteps.Clean + + 2 + false + + Debug + Qt4ProjectManager.Qt4BuildConfiguration + 2 + + + D:/dev/software/softwareDirectory/build-AutoVerScheme-Desktop_Qt_5_14_2_MinGW_32_bit-Release + + + true + QtProjectManager.QMakeBuildStep + false + + false + false + true + + + true + Qt4ProjectManager.MakeStep + + false + + + false + + 2 + Build + Build + ProjectExplorer.BuildSteps.Build + + + + true + Qt4ProjectManager.MakeStep + + true + clean + + false + + 1 + Clean + Clean + ProjectExplorer.BuildSteps.Clean + + 2 + false + + Release + Qt4ProjectManager.Qt4BuildConfiguration + 0 + + + D:/dev/software/softwareDirectory/build-AutoVerScheme-Desktop_Qt_5_14_2_MinGW_32_bit-Profile + + + true + QtProjectManager.QMakeBuildStep + true + + false + true + true + + + true + Qt4ProjectManager.MakeStep + + false + + + false + + 2 + Build + Build + ProjectExplorer.BuildSteps.Build + + + + true + Qt4ProjectManager.MakeStep + + true + clean + + false + + 1 + Clean + Clean + ProjectExplorer.BuildSteps.Clean + + 2 + false + + Profile + Qt4ProjectManager.Qt4BuildConfiguration + 0 + + 3 + + + 0 + Deploy + Deploy + ProjectExplorer.BuildSteps.Deploy + + 1 + ProjectExplorer.DefaultDeployConfiguration + + 1 + + + dwarf + + cpu-cycles + + + 250 + + -e + cpu-cycles + --call-graph + dwarf,4096 + -F + 250 + + -F + true + 4096 + false + false + 1000 + + true + + false + false + false + false + true + 0.01 + 10 + true + kcachegrind + 1 + 25 + + 1 + true + false + true + valgrind + + 0 + 1 + 2 + 3 + 4 + 5 + 6 + 7 + 8 + 9 + 10 + 11 + 12 + 13 + 14 + + 2 + + Qt4ProjectManager.Qt4RunConfiguration:D:/dev/software/softwareDirectory/AutoVerScheme/AutoVerScheme.pro + D:/dev/software/softwareDirectory/AutoVerScheme/AutoVerScheme.pro + + false + + false + true + true + false + false + true + + + + 1 + + + + ProjectExplorer.Project.TargetCount + 2 + + + ProjectExplorer.Project.Updater.FileVersion + 22 + + + Version + 22 + + diff --git a/softwareDirectory/AutoVerScheme/checkmethodmanage.ui b/softwareDirectory/AutoVerScheme/checkmethodmanage.ui index 648509b..da56d61 100644 --- a/softwareDirectory/AutoVerScheme/checkmethodmanage.ui +++ b/softwareDirectory/AutoVerScheme/checkmethodmanage.ui @@ -123,8 +123,7 @@ color: rgb(255, 255, 255); background-color: rgb(74, 102, 186); -border-radius:5px; -padding:10px 20px; +border-radius:5px; 查询 diff --git a/softwareDirectory/AutoVerScheme/checkwindow.cpp b/softwareDirectory/AutoVerScheme/checkwindow.cpp index 51650f9..da86ad4 100644 --- a/softwareDirectory/AutoVerScheme/checkwindow.cpp +++ b/softwareDirectory/AutoVerScheme/checkwindow.cpp @@ -9,12 +9,17 @@ ui(new Ui::CheckWindow) { ui->setupUi(this); - ui->tableWidgetDevice->setColumnCount(8); - ui->tableWidgetMethod->setColumnCount(7); + //ui->tableWidgetDevice->setColumnCount(8); + //ui->tableWidgetMethod->setColumnCount(7); + ui->tableWidgetDevice->verticalHeader()->setParent(nullptr); for(int i=2;i<8;i++) ui->tableWidgetDevice->horizontalHeader()->setSectionResizeMode(i,QHeaderView::Stretch); - for(int i=2;i<7;i++) + ui->tableWidgetMethod->verticalHeader()->setParent(nullptr); //隐藏行头 + for(int i=1;i<5;i++) ui->tableWidgetMethod->horizontalHeader()->setSectionResizeMode(i,QHeaderView::Stretch); + ui->tableWidgetMethod->setColumnWidth(0, 60); + ui->tableWidgetMethod->setColumnWidth(5, 100); + ui->tableWidget_3->verticalHeader()->setParent(nullptr); for(int i=0;i<2;i++) ui->tableWidget_3->horizontalHeader()->setSectionResizeMode(i,QHeaderView::Stretch); getCheckDevice(); @@ -24,12 +29,15 @@ CheckWindow::~CheckWindow() { + myTaskList.clear(); + programList.clear(); delete ui; } void CheckWindow::showMethod() { ui->stackedWidget->setCurrentIndex(1); + getCheckMethod(); } void CheckWindow::showDevice() @@ -46,6 +54,7 @@ { ui->stackedWidget_2->setCurrentIndex(0); ui->stackedWidget->setCurrentIndex(0); + getCheckDevice(); } void CheckWindow::showResult() @@ -57,18 +66,17 @@ void CheckWindow::getCheckDevice() { - - BaseCommonApi dbManager; - // 调用数据库管理器的函数获取数据 - + myTaskList.clear(); + ui->tableWidgetDevice->clearContents(); + ui->tableWidgetDevice->setRowCount(0); //模拟用户ID - QString userId="1640229293790650370"; - QList data = BaseCommonApi::getMyTasks(userId,"3"); + QString userId="1695282436182188034"; + myTaskList = BaseCommonApi::getMyTasks(userId,"3"); int rowCount = 0; int row=0; QString State; - for (const MyTask& myTask : data) { + for (const MyTask& myTask : myTaskList) { rowCount = ui->tableWidgetDevice->rowCount(); ui->tableWidgetDevice->insertRow(rowCount); @@ -87,3 +95,49 @@ row++; } } + +void CheckWindow::getCheckMethod() +{ + programList.clear(); + ui->tableWidgetMethod->clearContents(); + ui->tableWidgetMethod->setRowCount(0); + programList = BaseCommonApi::getVerificationProgramInfoMain(); + int rowCount = 0; + int row=0; + for (const VerificationProgramInfo& program : programList) { + rowCount = ui->tableWidgetMethod->rowCount(); + + ui->tableWidgetMethod->insertRow(rowCount); + QTableWidgetItem* p_check = new QTableWidgetItem(); + p_check->setCheckState(Qt::Unchecked); //设置首列为 CheckBox 控件 + ui->tableWidgetMethod->setItem(row,0,p_check); + ui->tableWidgetMethod->setItem(row, 1, new QTableWidgetItem(program.program_name)); //设置数据 + ui->tableWidgetMethod->setItem(row, 2, new QTableWidgetItem(program.create_name)); //设置数据 + ui->tableWidgetMethod->setItem(row, 3, new QTableWidgetItem(program.create_time.toString())); //设置数据 + ui->tableWidgetMethod->setItem(row, 4, new QTableWidgetItem(program.remark)); //设置数据 + + QPushButton *btn_1 = new QPushButton(); + btn_1->setText(tr("详情")); + btn_1->setStyleSheet("QPushButton{" + "background-color:rgba(255,255,255,0);" + "color:rgba(0,0,255,100);" + "text-decoration:underline;" + "}"); + btn_1->setCursor(Qt::PointingHandCursor); + connect(btn_1,SIGNAL(clicked()),this,SLOT(on_editButton_clicked())); + + btn_1->setIconSize(QSize(16,16)); + btn_1->setIcon(QIcon(":/image/Index/u2324.svg")); + QWidget *tmp_widget = new QWidget(); + QHBoxLayout *tmp_layout = new QHBoxLayout(tmp_widget); + tmp_layout->addWidget(btn_1); + tmp_layout->setMargin(0); + ui->tableWidgetMethod->setCellWidget(row,5,tmp_widget); + row++; + } +} + +void CheckWindow::on_editButton_clicked() +{ + +} diff --git a/softwareDirectory/AutoVerScheme/checkwindow.h b/softwareDirectory/AutoVerScheme/checkwindow.h index 005a85a..ea27646 100644 --- a/softwareDirectory/AutoVerScheme/checkwindow.h +++ b/softwareDirectory/AutoVerScheme/checkwindow.h @@ -2,6 +2,7 @@ #define CHECKWINDOW_H #include +#include "basecommonapi.h" namespace Ui { class CheckWindow; @@ -20,10 +21,14 @@ void showCheck(); void showMethodWidget(); void showResult(); + void on_editButton_clicked(); private: void getCheckDevice(); + void getCheckMethod(); private: Ui::CheckWindow *ui; + QList programList; + QList myTaskList; }; #endif // CHECKWINDOW_H diff --git a/softwareDirectory/AutoVerScheme/checkwindow.ui b/softwareDirectory/AutoVerScheme/checkwindow.ui index 20fbb81..1f7ef8c 100644 --- a/softwareDirectory/AutoVerScheme/checkwindow.ui +++ b/softwareDirectory/AutoVerScheme/checkwindow.ui @@ -598,11 +598,6 @@ - 序号 - - - - 检定程序名称 diff --git a/softwareDirectory/AutoVerScheme/formaddrsetting.cpp b/softwareDirectory/AutoVerScheme/formaddrsetting.cpp new file mode 100644 index 0000000..e0fb33a --- /dev/null +++ b/softwareDirectory/AutoVerScheme/formaddrsetting.cpp @@ -0,0 +1,14 @@ +#include "formaddrsetting.h" +#include "ui_formaddrsetting.h" + +FormAddrSetting::FormAddrSetting(QWidget *parent,int type,QString id) : + QWidget(parent), + ui(new Ui::FormAddrSetting) +{ + ui->setupUi(this); +} + +FormAddrSetting::~FormAddrSetting() +{ + delete ui; +} diff --git a/softwareDirectory/AutoVerScheme/formaddrsetting.h b/softwareDirectory/AutoVerScheme/formaddrsetting.h new file mode 100644 index 0000000..6392d44 --- /dev/null +++ b/softwareDirectory/AutoVerScheme/formaddrsetting.h @@ -0,0 +1,22 @@ +#ifndef FORMADDRSETTING_H +#define FORMADDRSETTING_H + +#include + +namespace Ui { +class FormAddrSetting; +} + +class FormAddrSetting : public QWidget +{ + Q_OBJECT + +public: + explicit FormAddrSetting(QWidget *parent = nullptr,int type=1,QString id=""); + ~FormAddrSetting(); + +private: + Ui::FormAddrSetting *ui; +}; + +#endif // FORMADDRSETTING_H diff --git a/softwareDirectory/AutoVerScheme/formaddrsetting.ui b/softwareDirectory/AutoVerScheme/formaddrsetting.ui new file mode 100644 index 0000000..9f73632 --- /dev/null +++ b/softwareDirectory/AutoVerScheme/formaddrsetting.ui @@ -0,0 +1,210 @@ + + + FormAddrSetting + + + + 0 + 0 + 1148 + 696 + + + + 设置通信命令 + + + background-color: rgb(242, 242, 242); + + + + + + 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); + + + 设置通信命令 + + + + + + + + + + + + + 20 + + + + + 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; + + + 新增 + + + + + + + + 1 + 0 + + + + + 72 + 26 + + + + + 12 + 75 + true + + + + color: rgb(255, 255, 255); +background-color: rgb(74, 102, 186); +border-radius:5px; + + + 删除 + + + + + + + + 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 + + + + + + + + + + + diff --git a/softwareDirectory/AutoVerScheme/formcheckpoint.cpp b/softwareDirectory/AutoVerScheme/formcheckpoint.cpp index 8053e94..cdc2e22 100644 --- a/softwareDirectory/AutoVerScheme/formcheckpoint.cpp +++ b/softwareDirectory/AutoVerScheme/formcheckpoint.cpp @@ -4,12 +4,13 @@ FormCheckPoint::FormCheckPoint(QWidget *parent,QString sId) : QWidget(parent), + checkId(sId), ui(new Ui::FormCheckPoint) { ui->setupUi(this); - if(sId!="") + if(checkId!="") { - + updateTable(checkId); } } @@ -17,3 +18,45 @@ { delete ui; } + +void FormCheckPoint::updateTable(QString id) +{ + //获取核查点tablewight的数据 + QStringList headlist; + + QList Data=BaseCommonApi::Search_CalibrationTable(id,&headlist); + + //tableWidgetItem + ui->tableWidget->setRowCount(0); + ui->tableWidget->setColumnCount(headlist.count()); + ui->tableWidget->setHorizontalHeaderLabels(headlist); + ui->tableWidget->verticalHeader()->setParent(nullptr); //隐藏行头 + for(int i=0;itableWidget->horizontalHeader()->setSectionResizeMode(i,QHeaderView::Stretch); + } + //循环数据 + int rowCount=0; + int row=0; + for (const QStringList& item : Data) + { + //获取行号 并进行添加行 + rowCount = ui->tableWidget->rowCount(); + ui->tableWidget->insertRow(rowCount); + //添加 序号 + ui->tableWidget->setItem(row, 0, new QTableWidgetItem(QString::number(row+1))); + //循环读取值 headlist，count是列的数量 + for(int i=1;itableWidget->setItem(row, i, new QTableWidgetItem(item[i])); + } + + row++; + + } +} + +void FormCheckPoint::on_pushButton_14_clicked() +{ + this->close(); +} diff --git a/softwareDirectory/AutoVerScheme/formcheckpoint.h b/softwareDirectory/AutoVerScheme/formcheckpoint.h index b54434b..3cbcd8e 100644 --- a/softwareDirectory/AutoVerScheme/formcheckpoint.h +++ b/softwareDirectory/AutoVerScheme/formcheckpoint.h @@ -12,11 +12,16 @@ Q_OBJECT public: - explicit FormCheckPoint(QWidget *parent = nullptr,QString checkId=""); + explicit FormCheckPoint(QWidget *parent = nullptr,QString sId=""); ~FormCheckPoint(); +private slots: + void on_pushButton_14_clicked(); private: + void updateTable(QString id); +private: Ui::FormCheckPoint *ui; + QString checkId=""; }; #endif // FORMCHECKPOINT_H diff --git a/softwareDirectory/AutoVerScheme/formcommsetting.cpp b/softwareDirectory/AutoVerScheme/formcommsetting.cpp new file mode 100644 index 0000000..26d7cb6 --- /dev/null +++ b/softwareDirectory/AutoVerScheme/formcommsetting.cpp @@ -0,0 +1,14 @@ +#include "formcommsetting.h" +#include "ui_formcommsetting.h" + +FormCommSetting::FormCommSetting(QWidget *parent,int type,QString id) : + QWidget(parent), + ui(new Ui::FormCommSetting) +{ + ui->setupUi(this); +} + +FormCommSetting::~FormCommSetting() +{ + delete ui; +} diff --git a/softwareDirectory/AutoVerScheme/formcommsetting.h b/softwareDirectory/AutoVerScheme/formcommsetting.h new file mode 100644 index 0000000..40cdb59 --- /dev/null +++ b/softwareDirectory/AutoVerScheme/formcommsetting.h @@ -0,0 +1,22 @@ +#ifndef FORMCOMMSETTING_H +#define FORMCOMMSETTING_H + +#include + +namespace Ui { +class FormCommSetting; +} + +class FormCommSetting : public QWidget +{ + Q_OBJECT + +public: + explicit FormCommSetting(QWidget *parent = nullptr,int type=1,QString id=""); + ~FormCommSetting(); + +private: + Ui::FormCommSetting *ui; +}; + +#endif // FORMCOMMSETTING_H diff --git a/softwareDirectory/AutoVerScheme/formcommsetting.ui b/softwareDirectory/AutoVerScheme/formcommsetting.ui new file mode 100644 index 0000000..35ab9d1 --- /dev/null +++ b/softwareDirectory/AutoVerScheme/formcommsetting.ui @@ -0,0 +1,418 @@ + + + FormCommSetting + + + + 0 + 0 + 1148 + 696 + + + + 设置设备接口 + + + background-color: rgb(242, 242, 242); + + + + + + 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); + + + 设置设备接口 + + + + + + + + + + background-color: rgb(255, 255, 255); + + + + 6 + + + 12 + + + + + + 12 + + + + 串口 + + + + + + + + 12 + + + + 端口号: + + + + + + + + 12 + + + + + + + + + 12 + + + + 设备地址: + + + + + + + + 12 + + + + + + + + + 12 + + + + 波特率: + + + + + + + + 12 + + + + + + + + + 12 + + + + 校验位: + + + + + + + + 12 + + + + + + + + + 12 + + + + 数据位: + + + + + + + + 12 + + + + + + + + + 12 + + + + 停止位: + + + + + + + + 12 + + + + + + + + + 12 + + + + 模式: + + + + + + + + 12 + + + + + + + + + 12 + + + + 流控: + + + + + + + + 12 + + + + + + + + + + + background-color: rgb(255, 255, 255); + + + + + + + 12 + + + + VISA + + + + + + + 12 + + + + + + 12 + + + + 设备地址: + + + + + + + + 400 + 0 + + + + + 12 + + + + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + + + + + + + + Qt::Vertical + + + + 20 + 373 + + + + + + + + + + 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 + + + + + + + + + + + diff --git a/softwareDirectory/AutoVerScheme/newcheckmethod.cpp b/softwareDirectory/AutoVerScheme/newcheckmethod.cpp index e087ef2..0f04030 100644 --- a/softwareDirectory/AutoVerScheme/newcheckmethod.cpp +++ b/softwareDirectory/AutoVerScheme/newcheckmethod.cpp @@ -5,6 +5,8 @@ #include "formcheckpoint.h" #include #include +#include "formcommsetting.h" +#include "formaddrsetting.h" NewCheckMethod::NewCheckMethod(QWidget *parent,QString sId) : QWidget(parent), @@ -129,6 +131,21 @@ { this->close(); } +void NewCheckMethod::on_cmdButton_clicked(int type,QString id) +{ + //qDebug() << "cmd click:" << type << id ; + FormAddrSetting *form = new FormAddrSetting(nullptr,type,id); + form->setWindowModality(Qt::ApplicationModal); + form->show(); +} + +void NewCheckMethod::on_commButton_clicked(int type,QString id) +{ + //qDebug() << "comm click:" << type << id ; + FormCommSetting *form = new FormCommSetting(nullptr,type,id); + form->setWindowModality(Qt::ApplicationModal); + form->show(); +} void NewCheckMethod::chooseDevices(QString checkIds, QString bizIds) { @@ -157,6 +174,41 @@ ui->tableWidget->setItem(row, 3, new QTableWidgetItem(result[0].help_instruction)); //设置数据 ui->tableWidget->setItem(row, 4, new QTableWidgetItem(result[0].manufacture_no)); //设置数据 ui->tableWidget->setItem(row, 5, new QTableWidgetItem(result[0].manufacturer)); + QPushButton *btn_1 = new QPushButton(); + btn_1->setText(tr("设置命令")); + btn_1->setStyleSheet("QPushButton{" + "background-color:rgba(255,255,255,0);" + "color:rgba(92,170,54,100);" + "text-decoration:underline;" + "}"); + btn_1->setCursor(Qt::PointingHandCursor); + int type=1; + //connect(btn_1,SIGNAL(clicked()),this,SLOT(on_cmdButton_clicked(1,id))); + connect(btn_1, &QPushButton::clicked, this, [this,type, id]() { + on_cmdButton_clicked(type,id); + }); + btn_1->setIconSize(QSize(16,16)); + btn_1->setIcon(QIcon(":/image/Index/u2324.svg")); + QPushButton *btn_2 = new QPushButton(); + btn_2->setText(tr("设置设备接口")); + btn_2->setStyleSheet("QPushButton{" + "background-color:rgba(255,255,255,0);" + "color:rgba(92,170,54,100);" + "text-decoration:underline;" + "}"); + btn_2->setCursor(Qt::PointingHandCursor); + //connect(btn_2,SIGNAL(clicked()),this,SLOT(on_commButton_clicked(1,id))); + connect(btn_2, &QPushButton::clicked, this, [this,type, id]() { + on_commButton_clicked(type,id); + }); + btn_2->setIconSize(QSize(16,16)); + btn_2->setIcon(QIcon(":/image/Index/u2324.svg")); + 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->setCellWidget(row,6,tmp_widget); row++; } } @@ -179,6 +231,40 @@ ui->tableWidget->setItem(row, 3, new QTableWidgetItem(result[0].remark)); //设置数据 ui->tableWidget->setItem(row, 4, new QTableWidgetItem(result[0].manufacture_no)); //设置数据 ui->tableWidget->setItem(row, 5, new QTableWidgetItem(result[0].manufacturer)); + QPushButton *btn_1 = new QPushButton(); + btn_1->setText(tr("设置命令")); + btn_1->setStyleSheet("QPushButton{" + "background-color:rgba(255,255,255,0);" + "color:rgba(92,170,54,100);" + "text-decoration:underline;" + "}"); + btn_1->setCursor(Qt::PointingHandCursor); + int type=2; + connect(btn_1, &QPushButton::clicked, this, [this,type, id]() { + on_cmdButton_clicked(type,id); + }); + + btn_1->setIconSize(QSize(16,16)); + btn_1->setIcon(QIcon(":/image/Index/u2324.svg")); + QPushButton *btn_2 = new QPushButton(); + btn_2->setText(tr("设置设备接口")); + btn_2->setStyleSheet("QPushButton{" + "background-color:rgba(255,255,255,0);" + "color:rgba(92,170,54,100);" + "text-decoration:underline;" + "}"); + btn_2->setCursor(Qt::PointingHandCursor); + connect(btn_2, &QPushButton::clicked, this, [this,type, id]() { + on_commButton_clicked(type,id); + }); + btn_2->setIconSize(QSize(16,16)); + btn_2->setIcon(QIcon(":/image/Index/u2324.svg")); + 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->setCellWidget(row,6,tmp_widget); row++; } } diff --git a/softwareDirectory/AutoVerScheme/AutoVerScheme.pro b/softwareDirectory/AutoVerScheme/AutoVerScheme.pro index 7864245..b84a377 100644 --- a/softwareDirectory/AutoVerScheme/AutoVerScheme.pro +++ b/softwareDirectory/AutoVerScheme/AutoVerScheme.pro @@ -31,7 +31,9 @@ depar_task.cpp \ depar_task_server.cpp \ dialogcheckresult.cpp \ + formaddrsetting.cpp \ formcheckpoint.cpp \ + formcommsetting.cpp \ formverypoint.cpp \ indexwindow.cpp \ infomanageview.cpp \ @@ -53,6 +55,8 @@ wordengine.cpp HEADERS += \ + formaddrsetting.h \ + formcommsetting.h \ id/IdWorker.h \ id/Noncopyable.h \ id/Singleton.h \ @@ -102,7 +106,9 @@ datasyncview.ui \ depar_task.ui \ dialogcheckresult.ui \ + formaddrsetting.ui \ formcheckpoint.ui \ + formcommsetting.ui \ formverypoint.ui \ indexwindow.ui \ infomanageview.ui \ diff --git a/softwareDirectory/AutoVerScheme/AutoVerScheme.pro.user b/softwareDirectory/AutoVerScheme/AutoVerScheme.pro.user new file mode 100644 index 0000000..2ced4d3 --- /dev/null +++ b/softwareDirectory/AutoVerScheme/AutoVerScheme.pro.user @@ -0,0 +1,562 @@ + + + + + + EnvironmentId + {2746248a-b112-4e0f-9ae0-9e61f2a42309} + + + ProjectExplorer.Project.ActiveTarget + 0 + + + ProjectExplorer.Project.EditorSettings + + true + false + true + + Cpp + + CppGlobal + + + + QmlJS + + QmlJSGlobal + + + 2 + UTF-8 + false + 4 + false + 80 + true + true + 1 + true + false + 0 + true + true + 0 + 8 + true + 1 + true + true + true + false + + + + ProjectExplorer.Project.PluginSettings + + + -fno-delayed-template-parsing + + true + + + + ProjectExplorer.Project.Target.0 + + Desktop Qt 5.14.2 MinGW 64-bit + Desktop Qt 5.14.2 MinGW 64-bit + qt.qt5.5142.win64_mingw73_kit + 0 + 0 + 0 + + D:/dev/software/softwareDirectory/build-AutoVerScheme-Desktop_Qt_5_14_2_MinGW_64_bit-Debug + + + true + QtProjectManager.QMakeBuildStep + true + + false + false + false + + + true + Qt4ProjectManager.MakeStep + + false + + + false + + 2 + Build + Build + ProjectExplorer.BuildSteps.Build + + + + true + Qt4ProjectManager.MakeStep + + true + clean + + false + + 1 + Clean + Clean + ProjectExplorer.BuildSteps.Clean + + 2 + false + + Debug + Qt4ProjectManager.Qt4BuildConfiguration + 2 + + + D:/dev/software/softwareDirectory/build-AutoVerScheme-Desktop_Qt_5_14_2_MinGW_64_bit-Release + + + true + QtProjectManager.QMakeBuildStep + false + + false + false + true + + + true + Qt4ProjectManager.MakeStep + + false + + + false + + 2 + Build + Build + ProjectExplorer.BuildSteps.Build + + + + true + Qt4ProjectManager.MakeStep + + true + clean + + false + + 1 + Clean + Clean + ProjectExplorer.BuildSteps.Clean + + 2 + false + + Release + Qt4ProjectManager.Qt4BuildConfiguration + 0 + + + D:/dev/software/softwareDirectory/build-AutoVerScheme-Desktop_Qt_5_14_2_MinGW_64_bit-Profile + + + true + QtProjectManager.QMakeBuildStep + true + + false + true + true + + + true + Qt4ProjectManager.MakeStep + + false + + + false + + 2 + Build + Build + ProjectExplorer.BuildSteps.Build + + + + true + Qt4ProjectManager.MakeStep + + true + clean + + false + + 1 + Clean + Clean + ProjectExplorer.BuildSteps.Clean + + 2 + false + + Profile + Qt4ProjectManager.Qt4BuildConfiguration + 0 + + 3 + + + 0 + Deploy + Deploy + ProjectExplorer.BuildSteps.Deploy + + 1 + ProjectExplorer.DefaultDeployConfiguration + + 1 + + + dwarf + + cpu-cycles + + + 250 + + -e + cpu-cycles + --call-graph + dwarf,4096 + -F + 250 + + -F + true + 4096 + false + false + 1000 + + true + + false + false + false + false + true + 0.01 + 10 + true + kcachegrind + 1 + 25 + + 1 + true + false + true + valgrind + + 0 + 1 + 2 + 3 + 4 + 5 + 6 + 7 + 8 + 9 + 10 + 11 + 12 + 13 + 14 + + 2 + + Qt4ProjectManager.Qt4RunConfiguration:D:/dev/software/softwareDirectory/AutoVerScheme/AutoVerScheme.pro + D:/dev/software/softwareDirectory/AutoVerScheme/AutoVerScheme.pro + + false + + false + true + true + false + false + true + + D:/dev/software/softwareDirectory/build-AutoVerScheme-Desktop_Qt_5_14_2_MinGW_64_bit-Debug + + 1 + + + + ProjectExplorer.Project.Target.1 + + Desktop Qt 5.14.2 MinGW 32-bit + Desktop Qt 5.14.2 MinGW 32-bit + qt.qt5.5142.win32_mingw73_kit + 0 + 0 + 0 + + D:/dev/software/softwareDirectory/build-AutoVerScheme-Desktop_Qt_5_14_2_MinGW_32_bit-Debug + + + true + QtProjectManager.QMakeBuildStep + true + + false + false + false + + + true + Qt4ProjectManager.MakeStep + + false + + + false + + 2 + Build + Build + ProjectExplorer.BuildSteps.Build + + + + true + Qt4ProjectManager.MakeStep + + true + clean + + false + + 1 + Clean + Clean + ProjectExplorer.BuildSteps.Clean + + 2 + false + + Debug + Qt4ProjectManager.Qt4BuildConfiguration + 2 + + + D:/dev/software/softwareDirectory/build-AutoVerScheme-Desktop_Qt_5_14_2_MinGW_32_bit-Release + + + true + QtProjectManager.QMakeBuildStep + false + + false + false + true + + + true + Qt4ProjectManager.MakeStep + + false + + + false + + 2 + Build + Build + ProjectExplorer.BuildSteps.Build + + + + true + Qt4ProjectManager.MakeStep + + true + clean + + false + + 1 + Clean + Clean + ProjectExplorer.BuildSteps.Clean + + 2 + false + + Release + Qt4ProjectManager.Qt4BuildConfiguration + 0 + + + D:/dev/software/softwareDirectory/build-AutoVerScheme-Desktop_Qt_5_14_2_MinGW_32_bit-Profile + + + true + QtProjectManager.QMakeBuildStep + true + + false + true + true + + + true + Qt4ProjectManager.MakeStep + + false + + + false + + 2 + Build + Build + ProjectExplorer.BuildSteps.Build + + + + true + Qt4ProjectManager.MakeStep + + true + clean + + false + + 1 + Clean + Clean + ProjectExplorer.BuildSteps.Clean + + 2 + false + + Profile + Qt4ProjectManager.Qt4BuildConfiguration + 0 + + 3 + + + 0 + Deploy + Deploy + ProjectExplorer.BuildSteps.Deploy + + 1 + ProjectExplorer.DefaultDeployConfiguration + + 1 + + + dwarf + + cpu-cycles + + + 250 + + -e + cpu-cycles + --call-graph + dwarf,4096 + -F + 250 + + -F + true + 4096 + false + false + 1000 + + true + + false + false + false + false + true + 0.01 + 10 + true + kcachegrind + 1 + 25 + + 1 + true + false + true + valgrind + + 0 + 1 + 2 + 3 + 4 + 5 + 6 + 7 + 8 + 9 + 10 + 11 + 12 + 13 + 14 + + 2 + + Qt4ProjectManager.Qt4RunConfiguration:D:/dev/software/softwareDirectory/AutoVerScheme/AutoVerScheme.pro + D:/dev/software/softwareDirectory/AutoVerScheme/AutoVerScheme.pro + + false + + false + true + true + false + false + true + + + + 1 + + + + ProjectExplorer.Project.TargetCount + 2 + + + ProjectExplorer.Project.Updater.FileVersion + 22 + + + Version + 22 + + diff --git a/softwareDirectory/AutoVerScheme/checkmethodmanage.ui b/softwareDirectory/AutoVerScheme/checkmethodmanage.ui index 648509b..da56d61 100644 --- a/softwareDirectory/AutoVerScheme/checkmethodmanage.ui +++ b/softwareDirectory/AutoVerScheme/checkmethodmanage.ui @@ -123,8 +123,7 @@ color: rgb(255, 255, 255); background-color: rgb(74, 102, 186); -border-radius:5px; -padding:10px 20px; +border-radius:5px; 查询 diff --git a/softwareDirectory/AutoVerScheme/checkwindow.cpp b/softwareDirectory/AutoVerScheme/checkwindow.cpp index 51650f9..da86ad4 100644 --- a/softwareDirectory/AutoVerScheme/checkwindow.cpp +++ b/softwareDirectory/AutoVerScheme/checkwindow.cpp @@ -9,12 +9,17 @@ ui(new Ui::CheckWindow) { ui->setupUi(this); - ui->tableWidgetDevice->setColumnCount(8); - ui->tableWidgetMethod->setColumnCount(7); + //ui->tableWidgetDevice->setColumnCount(8); + //ui->tableWidgetMethod->setColumnCount(7); + ui->tableWidgetDevice->verticalHeader()->setParent(nullptr); for(int i=2;i<8;i++) ui->tableWidgetDevice->horizontalHeader()->setSectionResizeMode(i,QHeaderView::Stretch); - for(int i=2;i<7;i++) + ui->tableWidgetMethod->verticalHeader()->setParent(nullptr); //隐藏行头 + for(int i=1;i<5;i++) ui->tableWidgetMethod->horizontalHeader()->setSectionResizeMode(i,QHeaderView::Stretch); + ui->tableWidgetMethod->setColumnWidth(0, 60); + ui->tableWidgetMethod->setColumnWidth(5, 100); + ui->tableWidget_3->verticalHeader()->setParent(nullptr); for(int i=0;i<2;i++) ui->tableWidget_3->horizontalHeader()->setSectionResizeMode(i,QHeaderView::Stretch); getCheckDevice(); @@ -24,12 +29,15 @@ CheckWindow::~CheckWindow() { + myTaskList.clear(); + programList.clear(); delete ui; } void CheckWindow::showMethod() { ui->stackedWidget->setCurrentIndex(1); + getCheckMethod(); } void CheckWindow::showDevice() @@ -46,6 +54,7 @@ { ui->stackedWidget_2->setCurrentIndex(0); ui->stackedWidget->setCurrentIndex(0); + getCheckDevice(); } void CheckWindow::showResult() @@ -57,18 +66,17 @@ void CheckWindow::getCheckDevice() { - - BaseCommonApi dbManager; - // 调用数据库管理器的函数获取数据 - + myTaskList.clear(); + ui->tableWidgetDevice->clearContents(); + ui->tableWidgetDevice->setRowCount(0); //模拟用户ID - QString userId="1640229293790650370"; - QList data = BaseCommonApi::getMyTasks(userId,"3"); + QString userId="1695282436182188034"; + myTaskList = BaseCommonApi::getMyTasks(userId,"3"); int rowCount = 0; int row=0; QString State; - for (const MyTask& myTask : data) { + for (const MyTask& myTask : myTaskList) { rowCount = ui->tableWidgetDevice->rowCount(); ui->tableWidgetDevice->insertRow(rowCount); @@ -87,3 +95,49 @@ row++; } } + +void CheckWindow::getCheckMethod() +{ + programList.clear(); + ui->tableWidgetMethod->clearContents(); + ui->tableWidgetMethod->setRowCount(0); + programList = BaseCommonApi::getVerificationProgramInfoMain(); + int rowCount = 0; + int row=0; + for (const VerificationProgramInfo& program : programList) { + rowCount = ui->tableWidgetMethod->rowCount(); + + ui->tableWidgetMethod->insertRow(rowCount); + QTableWidgetItem* p_check = new QTableWidgetItem(); + p_check->setCheckState(Qt::Unchecked); //设置首列为 CheckBox 控件 + ui->tableWidgetMethod->setItem(row,0,p_check); + ui->tableWidgetMethod->setItem(row, 1, new QTableWidgetItem(program.program_name)); //设置数据 + ui->tableWidgetMethod->setItem(row, 2, new QTableWidgetItem(program.create_name)); //设置数据 + ui->tableWidgetMethod->setItem(row, 3, new QTableWidgetItem(program.create_time.toString())); //设置数据 + ui->tableWidgetMethod->setItem(row, 4, new QTableWidgetItem(program.remark)); //设置数据 + + QPushButton *btn_1 = new QPushButton(); + btn_1->setText(tr("详情")); + btn_1->setStyleSheet("QPushButton{" + "background-color:rgba(255,255,255,0);" + "color:rgba(0,0,255,100);" + "text-decoration:underline;" + "}"); + btn_1->setCursor(Qt::PointingHandCursor); + connect(btn_1,SIGNAL(clicked()),this,SLOT(on_editButton_clicked())); + + btn_1->setIconSize(QSize(16,16)); + btn_1->setIcon(QIcon(":/image/Index/u2324.svg")); + QWidget *tmp_widget = new QWidget(); + QHBoxLayout *tmp_layout = new QHBoxLayout(tmp_widget); + tmp_layout->addWidget(btn_1); + tmp_layout->setMargin(0); + ui->tableWidgetMethod->setCellWidget(row,5,tmp_widget); + row++; + } +} + +void CheckWindow::on_editButton_clicked() +{ + +} diff --git a/softwareDirectory/AutoVerScheme/checkwindow.h b/softwareDirectory/AutoVerScheme/checkwindow.h index 005a85a..ea27646 100644 --- a/softwareDirectory/AutoVerScheme/checkwindow.h +++ b/softwareDirectory/AutoVerScheme/checkwindow.h @@ -2,6 +2,7 @@ #define CHECKWINDOW_H #include +#include "basecommonapi.h" namespace Ui { class CheckWindow; @@ -20,10 +21,14 @@ void showCheck(); void showMethodWidget(); void showResult(); + void on_editButton_clicked(); private: void getCheckDevice(); + void getCheckMethod(); private: Ui::CheckWindow *ui; + QList programList; + QList myTaskList; }; #endif // CHECKWINDOW_H diff --git a/softwareDirectory/AutoVerScheme/checkwindow.ui b/softwareDirectory/AutoVerScheme/checkwindow.ui index 20fbb81..1f7ef8c 100644 --- a/softwareDirectory/AutoVerScheme/checkwindow.ui +++ b/softwareDirectory/AutoVerScheme/checkwindow.ui @@ -598,11 +598,6 @@ - 序号 - - - - 检定程序名称 diff --git a/softwareDirectory/AutoVerScheme/formaddrsetting.cpp b/softwareDirectory/AutoVerScheme/formaddrsetting.cpp new file mode 100644 index 0000000..e0fb33a --- /dev/null +++ b/softwareDirectory/AutoVerScheme/formaddrsetting.cpp @@ -0,0 +1,14 @@ +#include "formaddrsetting.h" +#include "ui_formaddrsetting.h" + +FormAddrSetting::FormAddrSetting(QWidget *parent,int type,QString id) : + QWidget(parent), + ui(new Ui::FormAddrSetting) +{ + ui->setupUi(this); +} + +FormAddrSetting::~FormAddrSetting() +{ + delete ui; +} diff --git a/softwareDirectory/AutoVerScheme/formaddrsetting.h b/softwareDirectory/AutoVerScheme/formaddrsetting.h new file mode 100644 index 0000000..6392d44 --- /dev/null +++ b/softwareDirectory/AutoVerScheme/formaddrsetting.h @@ -0,0 +1,22 @@ +#ifndef FORMADDRSETTING_H +#define FORMADDRSETTING_H + +#include + +namespace Ui { +class FormAddrSetting; +} + +class FormAddrSetting : public QWidget +{ + Q_OBJECT + +public: + explicit FormAddrSetting(QWidget *parent = nullptr,int type=1,QString id=""); + ~FormAddrSetting(); + +private: + Ui::FormAddrSetting *ui; +}; + +#endif // FORMADDRSETTING_H diff --git a/softwareDirectory/AutoVerScheme/formaddrsetting.ui b/softwareDirectory/AutoVerScheme/formaddrsetting.ui new file mode 100644 index 0000000..9f73632 --- /dev/null +++ b/softwareDirectory/AutoVerScheme/formaddrsetting.ui @@ -0,0 +1,210 @@ + + + FormAddrSetting + + + + 0 + 0 + 1148 + 696 + + + + 设置通信命令 + + + background-color: rgb(242, 242, 242); + + + + + + 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); + + + 设置通信命令 + + + + + + + + + + + + + 20 + + + + + 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; + + + 新增 + + + + + + + + 1 + 0 + + + + + 72 + 26 + + + + + 12 + 75 + true + + + + color: rgb(255, 255, 255); +background-color: rgb(74, 102, 186); +border-radius:5px; + + + 删除 + + + + + + + + 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 + + + + + + + + + + + diff --git a/softwareDirectory/AutoVerScheme/formcheckpoint.cpp b/softwareDirectory/AutoVerScheme/formcheckpoint.cpp index 8053e94..cdc2e22 100644 --- a/softwareDirectory/AutoVerScheme/formcheckpoint.cpp +++ b/softwareDirectory/AutoVerScheme/formcheckpoint.cpp @@ -4,12 +4,13 @@ FormCheckPoint::FormCheckPoint(QWidget *parent,QString sId) : QWidget(parent), + checkId(sId), ui(new Ui::FormCheckPoint) { ui->setupUi(this); - if(sId!="") + if(checkId!="") { - + updateTable(checkId); } } @@ -17,3 +18,45 @@ { delete ui; } + +void FormCheckPoint::updateTable(QString id) +{ + //获取核查点tablewight的数据 + QStringList headlist; + + QList Data=BaseCommonApi::Search_CalibrationTable(id,&headlist); + + //tableWidgetItem + ui->tableWidget->setRowCount(0); + ui->tableWidget->setColumnCount(headlist.count()); + ui->tableWidget->setHorizontalHeaderLabels(headlist); + ui->tableWidget->verticalHeader()->setParent(nullptr); //隐藏行头 + for(int i=0;itableWidget->horizontalHeader()->setSectionResizeMode(i,QHeaderView::Stretch); + } + //循环数据 + int rowCount=0; + int row=0; + for (const QStringList& item : Data) + { + //获取行号 并进行添加行 + rowCount = ui->tableWidget->rowCount(); + ui->tableWidget->insertRow(rowCount); + //添加 序号 + ui->tableWidget->setItem(row, 0, new QTableWidgetItem(QString::number(row+1))); + //循环读取值 headlist，count是列的数量 + for(int i=1;itableWidget->setItem(row, i, new QTableWidgetItem(item[i])); + } + + row++; + + } +} + +void FormCheckPoint::on_pushButton_14_clicked() +{ + this->close(); +} diff --git a/softwareDirectory/AutoVerScheme/formcheckpoint.h b/softwareDirectory/AutoVerScheme/formcheckpoint.h index b54434b..3cbcd8e 100644 --- a/softwareDirectory/AutoVerScheme/formcheckpoint.h +++ b/softwareDirectory/AutoVerScheme/formcheckpoint.h @@ -12,11 +12,16 @@ Q_OBJECT public: - explicit FormCheckPoint(QWidget *parent = nullptr,QString checkId=""); + explicit FormCheckPoint(QWidget *parent = nullptr,QString sId=""); ~FormCheckPoint(); +private slots: + void on_pushButton_14_clicked(); private: + void updateTable(QString id); +private: Ui::FormCheckPoint *ui; + QString checkId=""; }; #endif // FORMCHECKPOINT_H diff --git a/softwareDirectory/AutoVerScheme/formcommsetting.cpp b/softwareDirectory/AutoVerScheme/formcommsetting.cpp new file mode 100644 index 0000000..26d7cb6 --- /dev/null +++ b/softwareDirectory/AutoVerScheme/formcommsetting.cpp @@ -0,0 +1,14 @@ +#include "formcommsetting.h" +#include "ui_formcommsetting.h" + +FormCommSetting::FormCommSetting(QWidget *parent,int type,QString id) : + QWidget(parent), + ui(new Ui::FormCommSetting) +{ + ui->setupUi(this); +} + +FormCommSetting::~FormCommSetting() +{ + delete ui; +} diff --git a/softwareDirectory/AutoVerScheme/formcommsetting.h b/softwareDirectory/AutoVerScheme/formcommsetting.h new file mode 100644 index 0000000..40cdb59 --- /dev/null +++ b/softwareDirectory/AutoVerScheme/formcommsetting.h @@ -0,0 +1,22 @@ +#ifndef FORMCOMMSETTING_H +#define FORMCOMMSETTING_H + +#include + +namespace Ui { +class FormCommSetting; +} + +class FormCommSetting : public QWidget +{ + Q_OBJECT + +public: + explicit FormCommSetting(QWidget *parent = nullptr,int type=1,QString id=""); + ~FormCommSetting(); + +private: + Ui::FormCommSetting *ui; +}; + +#endif // FORMCOMMSETTING_H diff --git a/softwareDirectory/AutoVerScheme/formcommsetting.ui b/softwareDirectory/AutoVerScheme/formcommsetting.ui new file mode 100644 index 0000000..35ab9d1 --- /dev/null +++ b/softwareDirectory/AutoVerScheme/formcommsetting.ui @@ -0,0 +1,418 @@ + + + FormCommSetting + + + + 0 + 0 + 1148 + 696 + + + + 设置设备接口 + + + background-color: rgb(242, 242, 242); + + + + + + 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); + + + 设置设备接口 + + + + + + + + + + background-color: rgb(255, 255, 255); + + + + 6 + + + 12 + + + + + + 12 + + + + 串口 + + + + + + + + 12 + + + + 端口号: + + + + + + + + 12 + + + + + + + + + 12 + + + + 设备地址: + + + + + + + + 12 + + + + + + + + + 12 + + + + 波特率: + + + + + + + + 12 + + + + + + + + + 12 + + + + 校验位: + + + + + + + + 12 + + + + + + + + + 12 + + + + 数据位: + + + + + + + + 12 + + + + + + + + + 12 + + + + 停止位: + + + + + + + + 12 + + + + + + + + + 12 + + + + 模式: + + + + + + + + 12 + + + + + + + + + 12 + + + + 流控: + + + + + + + + 12 + + + + + + + + + + + background-color: rgb(255, 255, 255); + + + + + + + 12 + + + + VISA + + + + + + + 12 + + + + + + 12 + + + + 设备地址: + + + + + + + + 400 + 0 + + + + + 12 + + + + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + + + + + + + + Qt::Vertical + + + + 20 + 373 + + + + + + + + + + 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 + + + + + + + + + + + diff --git a/softwareDirectory/AutoVerScheme/newcheckmethod.cpp b/softwareDirectory/AutoVerScheme/newcheckmethod.cpp index e087ef2..0f04030 100644 --- a/softwareDirectory/AutoVerScheme/newcheckmethod.cpp +++ b/softwareDirectory/AutoVerScheme/newcheckmethod.cpp @@ -5,6 +5,8 @@ #include "formcheckpoint.h" #include #include +#include "formcommsetting.h" +#include "formaddrsetting.h" NewCheckMethod::NewCheckMethod(QWidget *parent,QString sId) : QWidget(parent), @@ -129,6 +131,21 @@ { this->close(); } +void NewCheckMethod::on_cmdButton_clicked(int type,QString id) +{ + //qDebug() << "cmd click:" << type << id ; + FormAddrSetting *form = new FormAddrSetting(nullptr,type,id); + form->setWindowModality(Qt::ApplicationModal); + form->show(); +} + +void NewCheckMethod::on_commButton_clicked(int type,QString id) +{ + //qDebug() << "comm click:" << type << id ; + FormCommSetting *form = new FormCommSetting(nullptr,type,id); + form->setWindowModality(Qt::ApplicationModal); + form->show(); +} void NewCheckMethod::chooseDevices(QString checkIds, QString bizIds) { @@ -157,6 +174,41 @@ ui->tableWidget->setItem(row, 3, new QTableWidgetItem(result[0].help_instruction)); //设置数据 ui->tableWidget->setItem(row, 4, new QTableWidgetItem(result[0].manufacture_no)); //设置数据 ui->tableWidget->setItem(row, 5, new QTableWidgetItem(result[0].manufacturer)); + QPushButton *btn_1 = new QPushButton(); + btn_1->setText(tr("设置命令")); + btn_1->setStyleSheet("QPushButton{" + "background-color:rgba(255,255,255,0);" + "color:rgba(92,170,54,100);" + "text-decoration:underline;" + "}"); + btn_1->setCursor(Qt::PointingHandCursor); + int type=1; + //connect(btn_1,SIGNAL(clicked()),this,SLOT(on_cmdButton_clicked(1,id))); + connect(btn_1, &QPushButton::clicked, this, [this,type, id]() { + on_cmdButton_clicked(type,id); + }); + btn_1->setIconSize(QSize(16,16)); + btn_1->setIcon(QIcon(":/image/Index/u2324.svg")); + QPushButton *btn_2 = new QPushButton(); + btn_2->setText(tr("设置设备接口")); + btn_2->setStyleSheet("QPushButton{" + "background-color:rgba(255,255,255,0);" + "color:rgba(92,170,54,100);" + "text-decoration:underline;" + "}"); + btn_2->setCursor(Qt::PointingHandCursor); + //connect(btn_2,SIGNAL(clicked()),this,SLOT(on_commButton_clicked(1,id))); + connect(btn_2, &QPushButton::clicked, this, [this,type, id]() { + on_commButton_clicked(type,id); + }); + btn_2->setIconSize(QSize(16,16)); + btn_2->setIcon(QIcon(":/image/Index/u2324.svg")); + 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->setCellWidget(row,6,tmp_widget); row++; } } @@ -179,6 +231,40 @@ ui->tableWidget->setItem(row, 3, new QTableWidgetItem(result[0].remark)); //设置数据 ui->tableWidget->setItem(row, 4, new QTableWidgetItem(result[0].manufacture_no)); //设置数据 ui->tableWidget->setItem(row, 5, new QTableWidgetItem(result[0].manufacturer)); + QPushButton *btn_1 = new QPushButton(); + btn_1->setText(tr("设置命令")); + btn_1->setStyleSheet("QPushButton{" + "background-color:rgba(255,255,255,0);" + "color:rgba(92,170,54,100);" + "text-decoration:underline;" + "}"); + btn_1->setCursor(Qt::PointingHandCursor); + int type=2; + connect(btn_1, &QPushButton::clicked, this, [this,type, id]() { + on_cmdButton_clicked(type,id); + }); + + btn_1->setIconSize(QSize(16,16)); + btn_1->setIcon(QIcon(":/image/Index/u2324.svg")); + QPushButton *btn_2 = new QPushButton(); + btn_2->setText(tr("设置设备接口")); + btn_2->setStyleSheet("QPushButton{" + "background-color:rgba(255,255,255,0);" + "color:rgba(92,170,54,100);" + "text-decoration:underline;" + "}"); + btn_2->setCursor(Qt::PointingHandCursor); + connect(btn_2, &QPushButton::clicked, this, [this,type, id]() { + on_commButton_clicked(type,id); + }); + btn_2->setIconSize(QSize(16,16)); + btn_2->setIcon(QIcon(":/image/Index/u2324.svg")); + 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->setCellWidget(row,6,tmp_widget); row++; } } diff --git a/softwareDirectory/AutoVerScheme/newcheckmethod.h b/softwareDirectory/AutoVerScheme/newcheckmethod.h index 41eab56..8ac04c7 100644 --- a/softwareDirectory/AutoVerScheme/newcheckmethod.h +++ b/softwareDirectory/AutoVerScheme/newcheckmethod.h @@ -26,6 +26,8 @@ void on_pushButton_3_clicked(); void on_pushButton_4_clicked(); + void on_cmdButton_clicked(int type,QString id); + void on_commButton_clicked(int type,QString id); protected: void showEvent(QShowEvent *event); private: diff --git a/softwareDirectory/AutoVerScheme/AutoVerScheme.pro b/softwareDirectory/AutoVerScheme/AutoVerScheme.pro index 7864245..b84a377 100644 --- a/softwareDirectory/AutoVerScheme/AutoVerScheme.pro +++ b/softwareDirectory/AutoVerScheme/AutoVerScheme.pro @@ -31,7 +31,9 @@ depar_task.cpp \ depar_task_server.cpp \ dialogcheckresult.cpp \ + formaddrsetting.cpp \ formcheckpoint.cpp \ + formcommsetting.cpp \ formverypoint.cpp \ indexwindow.cpp \ infomanageview.cpp \ @@ -53,6 +55,8 @@ wordengine.cpp HEADERS += \ + formaddrsetting.h \ + formcommsetting.h \ id/IdWorker.h \ id/Noncopyable.h \ id/Singleton.h \ @@ -102,7 +106,9 @@ datasyncview.ui \ depar_task.ui \ dialogcheckresult.ui \ + formaddrsetting.ui \ formcheckpoint.ui \ + formcommsetting.ui \ formverypoint.ui \ indexwindow.ui \ infomanageview.ui \ diff --git a/softwareDirectory/AutoVerScheme/AutoVerScheme.pro.user b/softwareDirectory/AutoVerScheme/AutoVerScheme.pro.user new file mode 100644 index 0000000..2ced4d3 --- /dev/null +++ b/softwareDirectory/AutoVerScheme/AutoVerScheme.pro.user @@ -0,0 +1,562 @@ + + + + + + EnvironmentId + {2746248a-b112-4e0f-9ae0-9e61f2a42309} + + + ProjectExplorer.Project.ActiveTarget + 0 + + + ProjectExplorer.Project.EditorSettings + + true + false + true + + Cpp + + CppGlobal + + + + QmlJS + + QmlJSGlobal + + + 2 + UTF-8 + false + 4 + false + 80 + true + true + 1 + true + false + 0 + true + true + 0 + 8 + true + 1 + true + true + true + false + + + + ProjectExplorer.Project.PluginSettings + + + -fno-delayed-template-parsing + + true + + + + ProjectExplorer.Project.Target.0 + + Desktop Qt 5.14.2 MinGW 64-bit + Desktop Qt 5.14.2 MinGW 64-bit + qt.qt5.5142.win64_mingw73_kit + 0 + 0 + 0 + + D:/dev/software/softwareDirectory/build-AutoVerScheme-Desktop_Qt_5_14_2_MinGW_64_bit-Debug + + + true + QtProjectManager.QMakeBuildStep + true + + false + false + false + + + true + Qt4ProjectManager.MakeStep + + false + + + false + + 2 + Build + Build + ProjectExplorer.BuildSteps.Build + + + + true + Qt4ProjectManager.MakeStep + + true + clean + + false + + 1 + Clean + Clean + ProjectExplorer.BuildSteps.Clean + + 2 + false + + Debug + Qt4ProjectManager.Qt4BuildConfiguration + 2 + + + D:/dev/software/softwareDirectory/build-AutoVerScheme-Desktop_Qt_5_14_2_MinGW_64_bit-Release + + + true + QtProjectManager.QMakeBuildStep + false + + false + false + true + + + true + Qt4ProjectManager.MakeStep + + false + + + false + + 2 + Build + Build + ProjectExplorer.BuildSteps.Build + + + + true + Qt4ProjectManager.MakeStep + + true + clean + + false + + 1 + Clean + Clean + ProjectExplorer.BuildSteps.Clean + + 2 + false + + Release + Qt4ProjectManager.Qt4BuildConfiguration + 0 + + + D:/dev/software/softwareDirectory/build-AutoVerScheme-Desktop_Qt_5_14_2_MinGW_64_bit-Profile + + + true + QtProjectManager.QMakeBuildStep + true + + false + true + true + + + true + Qt4ProjectManager.MakeStep + + false + + + false + + 2 + Build + Build + ProjectExplorer.BuildSteps.Build + + + + true + Qt4ProjectManager.MakeStep + + true + clean + + false + + 1 + Clean + Clean + ProjectExplorer.BuildSteps.Clean + + 2 + false + + Profile + Qt4ProjectManager.Qt4BuildConfiguration + 0 + + 3 + + + 0 + Deploy + Deploy + ProjectExplorer.BuildSteps.Deploy + + 1 + ProjectExplorer.DefaultDeployConfiguration + + 1 + + + dwarf + + cpu-cycles + + + 250 + + -e + cpu-cycles + --call-graph + dwarf,4096 + -F + 250 + + -F + true + 4096 + false + false + 1000 + + true + + false + false + false + false + true + 0.01 + 10 + true + kcachegrind + 1 + 25 + + 1 + true + false + true + valgrind + + 0 + 1 + 2 + 3 + 4 + 5 + 6 + 7 + 8 + 9 + 10 + 11 + 12 + 13 + 14 + + 2 + + Qt4ProjectManager.Qt4RunConfiguration:D:/dev/software/softwareDirectory/AutoVerScheme/AutoVerScheme.pro + D:/dev/software/softwareDirectory/AutoVerScheme/AutoVerScheme.pro + + false + + false + true + true + false + false + true + + D:/dev/software/softwareDirectory/build-AutoVerScheme-Desktop_Qt_5_14_2_MinGW_64_bit-Debug + + 1 + + + + ProjectExplorer.Project.Target.1 + + Desktop Qt 5.14.2 MinGW 32-bit + Desktop Qt 5.14.2 MinGW 32-bit + qt.qt5.5142.win32_mingw73_kit + 0 + 0 + 0 + + D:/dev/software/softwareDirectory/build-AutoVerScheme-Desktop_Qt_5_14_2_MinGW_32_bit-Debug + + + true + QtProjectManager.QMakeBuildStep + true + + false + false + false + + + true + Qt4ProjectManager.MakeStep + + false + + + false + + 2 + Build + Build + ProjectExplorer.BuildSteps.Build + + + + true + Qt4ProjectManager.MakeStep + + true + clean + + false + + 1 + Clean + Clean + ProjectExplorer.BuildSteps.Clean + + 2 + false + + Debug + Qt4ProjectManager.Qt4BuildConfiguration + 2 + + + D:/dev/software/softwareDirectory/build-AutoVerScheme-Desktop_Qt_5_14_2_MinGW_32_bit-Release + + + true + QtProjectManager.QMakeBuildStep + false + + false + false + true + + + true + Qt4ProjectManager.MakeStep + + false + + + false + + 2 + Build + Build + ProjectExplorer.BuildSteps.Build + + + + true + Qt4ProjectManager.MakeStep + + true + clean + + false + + 1 + Clean + Clean + ProjectExplorer.BuildSteps.Clean + + 2 + false + + Release + Qt4ProjectManager.Qt4BuildConfiguration + 0 + + + D:/dev/software/softwareDirectory/build-AutoVerScheme-Desktop_Qt_5_14_2_MinGW_32_bit-Profile + + + true + QtProjectManager.QMakeBuildStep + true + + false + true + true + + + true + Qt4ProjectManager.MakeStep + + false + + + false + + 2 + Build + Build + ProjectExplorer.BuildSteps.Build + + + + true + Qt4ProjectManager.MakeStep + + true + clean + + false + + 1 + Clean + Clean + ProjectExplorer.BuildSteps.Clean + + 2 + false + + Profile + Qt4ProjectManager.Qt4BuildConfiguration + 0 + + 3 + + + 0 + Deploy + Deploy + ProjectExplorer.BuildSteps.Deploy + + 1 + ProjectExplorer.DefaultDeployConfiguration + + 1 + + + dwarf + + cpu-cycles + + + 250 + + -e + cpu-cycles + --call-graph + dwarf,4096 + -F + 250 + + -F + true + 4096 + false + false + 1000 + + true + + false + false + false + false + true + 0.01 + 10 + true + kcachegrind + 1 + 25 + + 1 + true + false + true + valgrind + + 0 + 1 + 2 + 3 + 4 + 5 + 6 + 7 + 8 + 9 + 10 + 11 + 12 + 13 + 14 + + 2 + + Qt4ProjectManager.Qt4RunConfiguration:D:/dev/software/softwareDirectory/AutoVerScheme/AutoVerScheme.pro + D:/dev/software/softwareDirectory/AutoVerScheme/AutoVerScheme.pro + + false + + false + true + true + false + false + true + + + + 1 + + + + ProjectExplorer.Project.TargetCount + 2 + + + ProjectExplorer.Project.Updater.FileVersion + 22 + + + Version + 22 + + diff --git a/softwareDirectory/AutoVerScheme/checkmethodmanage.ui b/softwareDirectory/AutoVerScheme/checkmethodmanage.ui index 648509b..da56d61 100644 --- a/softwareDirectory/AutoVerScheme/checkmethodmanage.ui +++ b/softwareDirectory/AutoVerScheme/checkmethodmanage.ui @@ -123,8 +123,7 @@ color: rgb(255, 255, 255); background-color: rgb(74, 102, 186); -border-radius:5px; -padding:10px 20px; +border-radius:5px; 查询 diff --git a/softwareDirectory/AutoVerScheme/checkwindow.cpp b/softwareDirectory/AutoVerScheme/checkwindow.cpp index 51650f9..da86ad4 100644 --- a/softwareDirectory/AutoVerScheme/checkwindow.cpp +++ b/softwareDirectory/AutoVerScheme/checkwindow.cpp @@ -9,12 +9,17 @@ ui(new Ui::CheckWindow) { ui->setupUi(this); - ui->tableWidgetDevice->setColumnCount(8); - ui->tableWidgetMethod->setColumnCount(7); + //ui->tableWidgetDevice->setColumnCount(8); + //ui->tableWidgetMethod->setColumnCount(7); + ui->tableWidgetDevice->verticalHeader()->setParent(nullptr); for(int i=2;i<8;i++) ui->tableWidgetDevice->horizontalHeader()->setSectionResizeMode(i,QHeaderView::Stretch); - for(int i=2;i<7;i++) + ui->tableWidgetMethod->verticalHeader()->setParent(nullptr); //隐藏行头 + for(int i=1;i<5;i++) ui->tableWidgetMethod->horizontalHeader()->setSectionResizeMode(i,QHeaderView::Stretch); + ui->tableWidgetMethod->setColumnWidth(0, 60); + ui->tableWidgetMethod->setColumnWidth(5, 100); + ui->tableWidget_3->verticalHeader()->setParent(nullptr); for(int i=0;i<2;i++) ui->tableWidget_3->horizontalHeader()->setSectionResizeMode(i,QHeaderView::Stretch); getCheckDevice(); @@ -24,12 +29,15 @@ CheckWindow::~CheckWindow() { + myTaskList.clear(); + programList.clear(); delete ui; } void CheckWindow::showMethod() { ui->stackedWidget->setCurrentIndex(1); + getCheckMethod(); } void CheckWindow::showDevice() @@ -46,6 +54,7 @@ { ui->stackedWidget_2->setCurrentIndex(0); ui->stackedWidget->setCurrentIndex(0); + getCheckDevice(); } void CheckWindow::showResult() @@ -57,18 +66,17 @@ void CheckWindow::getCheckDevice() { - - BaseCommonApi dbManager; - // 调用数据库管理器的函数获取数据 - + myTaskList.clear(); + ui->tableWidgetDevice->clearContents(); + ui->tableWidgetDevice->setRowCount(0); //模拟用户ID - QString userId="1640229293790650370"; - QList data = BaseCommonApi::getMyTasks(userId,"3"); + QString userId="1695282436182188034"; + myTaskList = BaseCommonApi::getMyTasks(userId,"3"); int rowCount = 0; int row=0; QString State; - for (const MyTask& myTask : data) { + for (const MyTask& myTask : myTaskList) { rowCount = ui->tableWidgetDevice->rowCount(); ui->tableWidgetDevice->insertRow(rowCount); @@ -87,3 +95,49 @@ row++; } } + +void CheckWindow::getCheckMethod() +{ + programList.clear(); + ui->tableWidgetMethod->clearContents(); + ui->tableWidgetMethod->setRowCount(0); + programList = BaseCommonApi::getVerificationProgramInfoMain(); + int rowCount = 0; + int row=0; + for (const VerificationProgramInfo& program : programList) { + rowCount = ui->tableWidgetMethod->rowCount(); + + ui->tableWidgetMethod->insertRow(rowCount); + QTableWidgetItem* p_check = new QTableWidgetItem(); + p_check->setCheckState(Qt::Unchecked); //设置首列为 CheckBox 控件 + ui->tableWidgetMethod->setItem(row,0,p_check); + ui->tableWidgetMethod->setItem(row, 1, new QTableWidgetItem(program.program_name)); //设置数据 + ui->tableWidgetMethod->setItem(row, 2, new QTableWidgetItem(program.create_name)); //设置数据 + ui->tableWidgetMethod->setItem(row, 3, new QTableWidgetItem(program.create_time.toString())); //设置数据 + ui->tableWidgetMethod->setItem(row, 4, new QTableWidgetItem(program.remark)); //设置数据 + + QPushButton *btn_1 = new QPushButton(); + btn_1->setText(tr("详情")); + btn_1->setStyleSheet("QPushButton{" + "background-color:rgba(255,255,255,0);" + "color:rgba(0,0,255,100);" + "text-decoration:underline;" + "}"); + btn_1->setCursor(Qt::PointingHandCursor); + connect(btn_1,SIGNAL(clicked()),this,SLOT(on_editButton_clicked())); + + btn_1->setIconSize(QSize(16,16)); + btn_1->setIcon(QIcon(":/image/Index/u2324.svg")); + QWidget *tmp_widget = new QWidget(); + QHBoxLayout *tmp_layout = new QHBoxLayout(tmp_widget); + tmp_layout->addWidget(btn_1); + tmp_layout->setMargin(0); + ui->tableWidgetMethod->setCellWidget(row,5,tmp_widget); + row++; + } +} + +void CheckWindow::on_editButton_clicked() +{ + +} diff --git a/softwareDirectory/AutoVerScheme/checkwindow.h b/softwareDirectory/AutoVerScheme/checkwindow.h index 005a85a..ea27646 100644 --- a/softwareDirectory/AutoVerScheme/checkwindow.h +++ b/softwareDirectory/AutoVerScheme/checkwindow.h @@ -2,6 +2,7 @@ #define CHECKWINDOW_H #include +#include "basecommonapi.h" namespace Ui { class CheckWindow; @@ -20,10 +21,14 @@ void showCheck(); void showMethodWidget(); void showResult(); + void on_editButton_clicked(); private: void getCheckDevice(); + void getCheckMethod(); private: Ui::CheckWindow *ui; + QList programList; + QList myTaskList; }; #endif // CHECKWINDOW_H diff --git a/softwareDirectory/AutoVerScheme/checkwindow.ui b/softwareDirectory/AutoVerScheme/checkwindow.ui index 20fbb81..1f7ef8c 100644 --- a/softwareDirectory/AutoVerScheme/checkwindow.ui +++ b/softwareDirectory/AutoVerScheme/checkwindow.ui @@ -598,11 +598,6 @@ - 序号 - - - - 检定程序名称 diff --git a/softwareDirectory/AutoVerScheme/formaddrsetting.cpp b/softwareDirectory/AutoVerScheme/formaddrsetting.cpp new file mode 100644 index 0000000..e0fb33a --- /dev/null +++ b/softwareDirectory/AutoVerScheme/formaddrsetting.cpp @@ -0,0 +1,14 @@ +#include "formaddrsetting.h" +#include "ui_formaddrsetting.h" + +FormAddrSetting::FormAddrSetting(QWidget *parent,int type,QString id) : + QWidget(parent), + ui(new Ui::FormAddrSetting) +{ + ui->setupUi(this); +} + +FormAddrSetting::~FormAddrSetting() +{ + delete ui; +} diff --git a/softwareDirectory/AutoVerScheme/formaddrsetting.h b/softwareDirectory/AutoVerScheme/formaddrsetting.h new file mode 100644 index 0000000..6392d44 --- /dev/null +++ b/softwareDirectory/AutoVerScheme/formaddrsetting.h @@ -0,0 +1,22 @@ +#ifndef FORMADDRSETTING_H +#define FORMADDRSETTING_H + +#include + +namespace Ui { +class FormAddrSetting; +} + +class FormAddrSetting : public QWidget +{ + Q_OBJECT + +public: + explicit FormAddrSetting(QWidget *parent = nullptr,int type=1,QString id=""); + ~FormAddrSetting(); + +private: + Ui::FormAddrSetting *ui; +}; + +#endif // FORMADDRSETTING_H diff --git a/softwareDirectory/AutoVerScheme/formaddrsetting.ui b/softwareDirectory/AutoVerScheme/formaddrsetting.ui new file mode 100644 index 0000000..9f73632 --- /dev/null +++ b/softwareDirectory/AutoVerScheme/formaddrsetting.ui @@ -0,0 +1,210 @@ + + + FormAddrSetting + + + + 0 + 0 + 1148 + 696 + + + + 设置通信命令 + + + background-color: rgb(242, 242, 242); + + + + + + 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); + + + 设置通信命令 + + + + + + + + + + + + + 20 + + + + + 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; + + + 新增 + + + + + + + + 1 + 0 + + + + + 72 + 26 + + + + + 12 + 75 + true + + + + color: rgb(255, 255, 255); +background-color: rgb(74, 102, 186); +border-radius:5px; + + + 删除 + + + + + + + + 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 + + + + + + + + + + + diff --git a/softwareDirectory/AutoVerScheme/formcheckpoint.cpp b/softwareDirectory/AutoVerScheme/formcheckpoint.cpp index 8053e94..cdc2e22 100644 --- a/softwareDirectory/AutoVerScheme/formcheckpoint.cpp +++ b/softwareDirectory/AutoVerScheme/formcheckpoint.cpp @@ -4,12 +4,13 @@ FormCheckPoint::FormCheckPoint(QWidget *parent,QString sId) : QWidget(parent), + checkId(sId), ui(new Ui::FormCheckPoint) { ui->setupUi(this); - if(sId!="") + if(checkId!="") { - + updateTable(checkId); } } @@ -17,3 +18,45 @@ { delete ui; } + +void FormCheckPoint::updateTable(QString id) +{ + //获取核查点tablewight的数据 + QStringList headlist; + + QList Data=BaseCommonApi::Search_CalibrationTable(id,&headlist); + + //tableWidgetItem + ui->tableWidget->setRowCount(0); + ui->tableWidget->setColumnCount(headlist.count()); + ui->tableWidget->setHorizontalHeaderLabels(headlist); + ui->tableWidget->verticalHeader()->setParent(nullptr); //隐藏行头 + for(int i=0;itableWidget->horizontalHeader()->setSectionResizeMode(i,QHeaderView::Stretch); + } + //循环数据 + int rowCount=0; + int row=0; + for (const QStringList& item : Data) + { + //获取行号 并进行添加行 + rowCount = ui->tableWidget->rowCount(); + ui->tableWidget->insertRow(rowCount); + //添加 序号 + ui->tableWidget->setItem(row, 0, new QTableWidgetItem(QString::number(row+1))); + //循环读取值 headlist，count是列的数量 + for(int i=1;itableWidget->setItem(row, i, new QTableWidgetItem(item[i])); + } + + row++; + + } +} + +void FormCheckPoint::on_pushButton_14_clicked() +{ + this->close(); +} diff --git a/softwareDirectory/AutoVerScheme/formcheckpoint.h b/softwareDirectory/AutoVerScheme/formcheckpoint.h index b54434b..3cbcd8e 100644 --- a/softwareDirectory/AutoVerScheme/formcheckpoint.h +++ b/softwareDirectory/AutoVerScheme/formcheckpoint.h @@ -12,11 +12,16 @@ Q_OBJECT public: - explicit FormCheckPoint(QWidget *parent = nullptr,QString checkId=""); + explicit FormCheckPoint(QWidget *parent = nullptr,QString sId=""); ~FormCheckPoint(); +private slots: + void on_pushButton_14_clicked(); private: + void updateTable(QString id); +private: Ui::FormCheckPoint *ui; + QString checkId=""; }; #endif // FORMCHECKPOINT_H diff --git a/softwareDirectory/AutoVerScheme/formcommsetting.cpp b/softwareDirectory/AutoVerScheme/formcommsetting.cpp new file mode 100644 index 0000000..26d7cb6 --- /dev/null +++ b/softwareDirectory/AutoVerScheme/formcommsetting.cpp @@ -0,0 +1,14 @@ +#include "formcommsetting.h" +#include "ui_formcommsetting.h" + +FormCommSetting::FormCommSetting(QWidget *parent,int type,QString id) : + QWidget(parent), + ui(new Ui::FormCommSetting) +{ + ui->setupUi(this); +} + +FormCommSetting::~FormCommSetting() +{ + delete ui; +} diff --git a/softwareDirectory/AutoVerScheme/formcommsetting.h b/softwareDirectory/AutoVerScheme/formcommsetting.h new file mode 100644 index 0000000..40cdb59 --- /dev/null +++ b/softwareDirectory/AutoVerScheme/formcommsetting.h @@ -0,0 +1,22 @@ +#ifndef FORMCOMMSETTING_H +#define FORMCOMMSETTING_H + +#include + +namespace Ui { +class FormCommSetting; +} + +class FormCommSetting : public QWidget +{ + Q_OBJECT + +public: + explicit FormCommSetting(QWidget *parent = nullptr,int type=1,QString id=""); + ~FormCommSetting(); + +private: + Ui::FormCommSetting *ui; +}; + +#endif // FORMCOMMSETTING_H diff --git a/softwareDirectory/AutoVerScheme/formcommsetting.ui b/softwareDirectory/AutoVerScheme/formcommsetting.ui new file mode 100644 index 0000000..35ab9d1 --- /dev/null +++ b/softwareDirectory/AutoVerScheme/formcommsetting.ui @@ -0,0 +1,418 @@ + + + FormCommSetting + + + + 0 + 0 + 1148 + 696 + + + + 设置设备接口 + + + background-color: rgb(242, 242, 242); + + + + + + 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); + + + 设置设备接口 + + + + + + + + + + background-color: rgb(255, 255, 255); + + + + 6 + + + 12 + + + + + + 12 + + + + 串口 + + + + + + + + 12 + + + + 端口号: + + + + + + + + 12 + + + + + + + + + 12 + + + + 设备地址: + + + + + + + + 12 + + + + + + + + + 12 + + + + 波特率: + + + + + + + + 12 + + + + + + + + + 12 + + + + 校验位: + + + + + + + + 12 + + + + + + + + + 12 + + + + 数据位: + + + + + + + + 12 + + + + + + + + + 12 + + + + 停止位: + + + + + + + + 12 + + + + + + + + + 12 + + + + 模式: + + + + + + + + 12 + + + + + + + + + 12 + + + + 流控: + + + + + + + + 12 + + + + + + + + + + + background-color: rgb(255, 255, 255); + + + + + + + 12 + + + + VISA + + + + + + + 12 + + + + + + 12 + + + + 设备地址: + + + + + + + + 400 + 0 + + + + + 12 + + + + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + + + + + + + + Qt::Vertical + + + + 20 + 373 + + + + + + + + + + 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 + + + + + + + + + + + diff --git a/softwareDirectory/AutoVerScheme/newcheckmethod.cpp b/softwareDirectory/AutoVerScheme/newcheckmethod.cpp index e087ef2..0f04030 100644 --- a/softwareDirectory/AutoVerScheme/newcheckmethod.cpp +++ b/softwareDirectory/AutoVerScheme/newcheckmethod.cpp @@ -5,6 +5,8 @@ #include "formcheckpoint.h" #include #include +#include "formcommsetting.h" +#include "formaddrsetting.h" NewCheckMethod::NewCheckMethod(QWidget *parent,QString sId) : QWidget(parent), @@ -129,6 +131,21 @@ { this->close(); } +void NewCheckMethod::on_cmdButton_clicked(int type,QString id) +{ + //qDebug() << "cmd click:" << type << id ; + FormAddrSetting *form = new FormAddrSetting(nullptr,type,id); + form->setWindowModality(Qt::ApplicationModal); + form->show(); +} + +void NewCheckMethod::on_commButton_clicked(int type,QString id) +{ + //qDebug() << "comm click:" << type << id ; + FormCommSetting *form = new FormCommSetting(nullptr,type,id); + form->setWindowModality(Qt::ApplicationModal); + form->show(); +} void NewCheckMethod::chooseDevices(QString checkIds, QString bizIds) { @@ -157,6 +174,41 @@ ui->tableWidget->setItem(row, 3, new QTableWidgetItem(result[0].help_instruction)); //设置数据 ui->tableWidget->setItem(row, 4, new QTableWidgetItem(result[0].manufacture_no)); //设置数据 ui->tableWidget->setItem(row, 5, new QTableWidgetItem(result[0].manufacturer)); + QPushButton *btn_1 = new QPushButton(); + btn_1->setText(tr("设置命令")); + btn_1->setStyleSheet("QPushButton{" + "background-color:rgba(255,255,255,0);" + "color:rgba(92,170,54,100);" + "text-decoration:underline;" + "}"); + btn_1->setCursor(Qt::PointingHandCursor); + int type=1; + //connect(btn_1,SIGNAL(clicked()),this,SLOT(on_cmdButton_clicked(1,id))); + connect(btn_1, &QPushButton::clicked, this, [this,type, id]() { + on_cmdButton_clicked(type,id); + }); + btn_1->setIconSize(QSize(16,16)); + btn_1->setIcon(QIcon(":/image/Index/u2324.svg")); + QPushButton *btn_2 = new QPushButton(); + btn_2->setText(tr("设置设备接口")); + btn_2->setStyleSheet("QPushButton{" + "background-color:rgba(255,255,255,0);" + "color:rgba(92,170,54,100);" + "text-decoration:underline;" + "}"); + btn_2->setCursor(Qt::PointingHandCursor); + //connect(btn_2,SIGNAL(clicked()),this,SLOT(on_commButton_clicked(1,id))); + connect(btn_2, &QPushButton::clicked, this, [this,type, id]() { + on_commButton_clicked(type,id); + }); + btn_2->setIconSize(QSize(16,16)); + btn_2->setIcon(QIcon(":/image/Index/u2324.svg")); + 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->setCellWidget(row,6,tmp_widget); row++; } } @@ -179,6 +231,40 @@ ui->tableWidget->setItem(row, 3, new QTableWidgetItem(result[0].remark)); //设置数据 ui->tableWidget->setItem(row, 4, new QTableWidgetItem(result[0].manufacture_no)); //设置数据 ui->tableWidget->setItem(row, 5, new QTableWidgetItem(result[0].manufacturer)); + QPushButton *btn_1 = new QPushButton(); + btn_1->setText(tr("设置命令")); + btn_1->setStyleSheet("QPushButton{" + "background-color:rgba(255,255,255,0);" + "color:rgba(92,170,54,100);" + "text-decoration:underline;" + "}"); + btn_1->setCursor(Qt::PointingHandCursor); + int type=2; + connect(btn_1, &QPushButton::clicked, this, [this,type, id]() { + on_cmdButton_clicked(type,id); + }); + + btn_1->setIconSize(QSize(16,16)); + btn_1->setIcon(QIcon(":/image/Index/u2324.svg")); + QPushButton *btn_2 = new QPushButton(); + btn_2->setText(tr("设置设备接口")); + btn_2->setStyleSheet("QPushButton{" + "background-color:rgba(255,255,255,0);" + "color:rgba(92,170,54,100);" + "text-decoration:underline;" + "}"); + btn_2->setCursor(Qt::PointingHandCursor); + connect(btn_2, &QPushButton::clicked, this, [this,type, id]() { + on_commButton_clicked(type,id); + }); + btn_2->setIconSize(QSize(16,16)); + btn_2->setIcon(QIcon(":/image/Index/u2324.svg")); + 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->setCellWidget(row,6,tmp_widget); row++; } } diff --git a/softwareDirectory/AutoVerScheme/newcheckmethod.h b/softwareDirectory/AutoVerScheme/newcheckmethod.h index 41eab56..8ac04c7 100644 --- a/softwareDirectory/AutoVerScheme/newcheckmethod.h +++ b/softwareDirectory/AutoVerScheme/newcheckmethod.h @@ -26,6 +26,8 @@ void on_pushButton_3_clicked(); void on_pushButton_4_clicked(); + void on_cmdButton_clicked(int type,QString id); + void on_commButton_clicked(int type,QString id); protected: void showEvent(QShowEvent *event); private: diff --git a/softwareDirectory/AutoVerScheme/verifymethodmanage.ui b/softwareDirectory/AutoVerScheme/verifymethodmanage.ui index d87b91b..bd33672 100644 --- a/softwareDirectory/AutoVerScheme/verifymethodmanage.ui +++ b/softwareDirectory/AutoVerScheme/verifymethodmanage.ui @@ -122,8 +122,7 @@ color: rgb(255, 255, 255); background-color: rgb(74, 102, 186); -border-radius:5px; -padding:10px 20px; +border-radius:5px; 查询