diff --git a/softwareDirectory/AutoVerScheme/AutoVerScheme.pro b/softwareDirectory/AutoVerScheme/AutoVerScheme.pro index b7a7f10..4b3cb2b 100644 --- a/softwareDirectory/AutoVerScheme/AutoVerScheme.pro +++ b/softwareDirectory/AutoVerScheme/AutoVerScheme.pro @@ -31,6 +31,8 @@ depar_task.cpp \ depar_task_server.cpp \ dialogcheckresult.cpp \ + formcheckpoint.cpp \ + formverypoint.cpp \ indexwindow.cpp \ infomanageview.cpp \ inspectdataitem.cpp \ @@ -66,6 +68,8 @@ depar_task.h \ depar_task_server.h \ dialogcheckresult.h \ + formcheckpoint.h \ + formverypoint.h \ indexwindow.h \ infomanageview.h \ inspectdataitem.h \ @@ -94,6 +98,8 @@ datasyncview.ui \ depar_task.ui \ dialogcheckresult.ui \ + formcheckpoint.ui \ + formverypoint.ui \ indexwindow.ui \ infomanageview.ui \ inspectdataitem.ui \ diff --git a/softwareDirectory/AutoVerScheme/AutoVerScheme.pro b/softwareDirectory/AutoVerScheme/AutoVerScheme.pro index b7a7f10..4b3cb2b 100644 --- a/softwareDirectory/AutoVerScheme/AutoVerScheme.pro +++ b/softwareDirectory/AutoVerScheme/AutoVerScheme.pro @@ -31,6 +31,8 @@ depar_task.cpp \ depar_task_server.cpp \ dialogcheckresult.cpp \ + formcheckpoint.cpp \ + formverypoint.cpp \ indexwindow.cpp \ infomanageview.cpp \ inspectdataitem.cpp \ @@ -66,6 +68,8 @@ depar_task.h \ depar_task_server.h \ dialogcheckresult.h \ + formcheckpoint.h \ + formverypoint.h \ indexwindow.h \ infomanageview.h \ inspectdataitem.h \ @@ -94,6 +98,8 @@ datasyncview.ui \ depar_task.ui \ dialogcheckresult.ui \ + formcheckpoint.ui \ + formverypoint.ui \ indexwindow.ui \ infomanageview.ui \ inspectdataitem.ui \ diff --git a/softwareDirectory/AutoVerScheme/AutoVerScheme.pro.user b/softwareDirectory/AutoVerScheme/AutoVerScheme.pro.user index b379c65..c5290fc 100644 --- a/softwareDirectory/AutoVerScheme/AutoVerScheme.pro.user +++ b/softwareDirectory/AutoVerScheme/AutoVerScheme.pro.user @@ -1,10 +1,10 @@ - + EnvironmentId - {94e4c4a1-54d4-412c-b108-da01d63f0d97} + {2746248a-b112-4e0f-9ae0-9e61f2a42309} ProjectExplorer.Project.ActiveTarget @@ -55,23 +55,40 @@ ProjectExplorer.Project.PluginSettings + + true + true + true + true + + 0 + true -fno-delayed-template-parsing true + + true + Builtin.TidyAndClazy + 4 + + + + true + ProjectExplorer.Project.Target.0 - Desktop Qt 5.14.2 MinGW 32-bit - Desktop Qt 5.14.2 MinGW 32-bit - qt.qt5.5142.win32_mingw73_kit + 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:/work/code/BJJZ/svntest/softwareDirectory/build-AutoVerScheme-Desktop_Qt_5_14_2_MinGW_32_bit-Debug + D:/dev/software/softwareDirectory/build-AutoVerScheme-Desktop_Qt_5_14_2_MinGW_64_bit-Debug true @@ -119,7 +136,7 @@ 2 - D:/work/code/BJJZ/svntest/softwareDirectory/build-AutoVerScheme-Desktop_Qt_5_14_2_MinGW_32_bit-Release + D:/dev/software/softwareDirectory/build-AutoVerScheme-Desktop_Qt_5_14_2_MinGW_64_bit-Release true @@ -167,7 +184,7 @@ 0 - D:/work/code/BJJZ/svntest/softwareDirectory/build-AutoVerScheme-Desktop_Qt_5_14_2_MinGW_32_bit-Profile + D:/dev/software/softwareDirectory/build-AutoVerScheme-Desktop_Qt_5_14_2_MinGW_64_bit-Profile true @@ -287,8 +304,8 @@ 2 - Qt4ProjectManager.Qt4RunConfiguration:D:/work/code/BJJZ/svntest/softwareDirectory/AutoVerScheme/AutoVerScheme.pro - D:/work/code/BJJZ/svntest/softwareDirectory/AutoVerScheme/AutoVerScheme.pro + Qt4ProjectManager.Qt4RunConfiguration:D:/dev/software/softwareDirectory/AutoVerScheme/AutoVerScheme.pro + D:/dev/software/softwareDirectory/AutoVerScheme/AutoVerScheme.pro false @@ -299,7 +316,7 @@ false true - D:/work/code/BJJZ/svntest/softwareDirectory/build-AutoVerScheme-Desktop_Qt_5_14_2_MinGW_32_bit-Debug + D:/dev/software/softwareDirectory/build-AutoVerScheme-Desktop_Qt_5_14_2_MinGW_64_bit-Debug 1 @@ -307,14 +324,14 @@ ProjectExplorer.Project.Target.1 - Desktop Qt 5.14.2 MinGW 64-bit - Desktop Qt 5.14.2 MinGW 64-bit - qt.qt5.5142.win64_mingw73_kit + 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:/work/code/BJJZ/svntest/softwareDirectory/build-AutoVerScheme-Desktop_Qt_5_14_2_MinGW_64_bit-Debug + D:/dev/software/softwareDirectory/build-AutoVerScheme-Desktop_Qt_5_14_2_MinGW_32_bit-Debug true @@ -362,7 +379,7 @@ 2 - D:/work/code/BJJZ/svntest/softwareDirectory/build-AutoVerScheme-Desktop_Qt_5_14_2_MinGW_64_bit-Release + D:/dev/software/softwareDirectory/build-AutoVerScheme-Desktop_Qt_5_14_2_MinGW_32_bit-Release true @@ -410,7 +427,7 @@ 0 - D:/work/code/BJJZ/svntest/softwareDirectory/build-AutoVerScheme-Desktop_Qt_5_14_2_MinGW_64_bit-Profile + D:/dev/software/softwareDirectory/build-AutoVerScheme-Desktop_Qt_5_14_2_MinGW_32_bit-Profile true @@ -530,14 +547,14 @@ 2 - - ProjectExplorer.CustomExecutableRunConfiguration - + Qt4ProjectManager.Qt4RunConfiguration:D:/dev/software/softwareDirectory/AutoVerScheme/AutoVerScheme.pro + D:/dev/software/softwareDirectory/AutoVerScheme/AutoVerScheme.pro false false true + true false false true diff --git a/softwareDirectory/AutoVerScheme/AutoVerScheme.pro b/softwareDirectory/AutoVerScheme/AutoVerScheme.pro index b7a7f10..4b3cb2b 100644 --- a/softwareDirectory/AutoVerScheme/AutoVerScheme.pro +++ b/softwareDirectory/AutoVerScheme/AutoVerScheme.pro @@ -31,6 +31,8 @@ depar_task.cpp \ depar_task_server.cpp \ dialogcheckresult.cpp \ + formcheckpoint.cpp \ + formverypoint.cpp \ indexwindow.cpp \ infomanageview.cpp \ inspectdataitem.cpp \ @@ -66,6 +68,8 @@ depar_task.h \ depar_task_server.h \ dialogcheckresult.h \ + formcheckpoint.h \ + formverypoint.h \ indexwindow.h \ infomanageview.h \ inspectdataitem.h \ @@ -94,6 +98,8 @@ datasyncview.ui \ depar_task.ui \ dialogcheckresult.ui \ + formcheckpoint.ui \ + formverypoint.ui \ indexwindow.ui \ infomanageview.ui \ inspectdataitem.ui \ diff --git a/softwareDirectory/AutoVerScheme/AutoVerScheme.pro.user b/softwareDirectory/AutoVerScheme/AutoVerScheme.pro.user index b379c65..c5290fc 100644 --- a/softwareDirectory/AutoVerScheme/AutoVerScheme.pro.user +++ b/softwareDirectory/AutoVerScheme/AutoVerScheme.pro.user @@ -1,10 +1,10 @@ - + EnvironmentId - {94e4c4a1-54d4-412c-b108-da01d63f0d97} + {2746248a-b112-4e0f-9ae0-9e61f2a42309} ProjectExplorer.Project.ActiveTarget @@ -55,23 +55,40 @@ ProjectExplorer.Project.PluginSettings + + true + true + true + true + + 0 + true -fno-delayed-template-parsing true + + true + Builtin.TidyAndClazy + 4 + + + + true + ProjectExplorer.Project.Target.0 - Desktop Qt 5.14.2 MinGW 32-bit - Desktop Qt 5.14.2 MinGW 32-bit - qt.qt5.5142.win32_mingw73_kit + 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:/work/code/BJJZ/svntest/softwareDirectory/build-AutoVerScheme-Desktop_Qt_5_14_2_MinGW_32_bit-Debug + D:/dev/software/softwareDirectory/build-AutoVerScheme-Desktop_Qt_5_14_2_MinGW_64_bit-Debug true @@ -119,7 +136,7 @@ 2 - D:/work/code/BJJZ/svntest/softwareDirectory/build-AutoVerScheme-Desktop_Qt_5_14_2_MinGW_32_bit-Release + D:/dev/software/softwareDirectory/build-AutoVerScheme-Desktop_Qt_5_14_2_MinGW_64_bit-Release true @@ -167,7 +184,7 @@ 0 - D:/work/code/BJJZ/svntest/softwareDirectory/build-AutoVerScheme-Desktop_Qt_5_14_2_MinGW_32_bit-Profile + D:/dev/software/softwareDirectory/build-AutoVerScheme-Desktop_Qt_5_14_2_MinGW_64_bit-Profile true @@ -287,8 +304,8 @@ 2 - Qt4ProjectManager.Qt4RunConfiguration:D:/work/code/BJJZ/svntest/softwareDirectory/AutoVerScheme/AutoVerScheme.pro - D:/work/code/BJJZ/svntest/softwareDirectory/AutoVerScheme/AutoVerScheme.pro + Qt4ProjectManager.Qt4RunConfiguration:D:/dev/software/softwareDirectory/AutoVerScheme/AutoVerScheme.pro + D:/dev/software/softwareDirectory/AutoVerScheme/AutoVerScheme.pro false @@ -299,7 +316,7 @@ false true - D:/work/code/BJJZ/svntest/softwareDirectory/build-AutoVerScheme-Desktop_Qt_5_14_2_MinGW_32_bit-Debug + D:/dev/software/softwareDirectory/build-AutoVerScheme-Desktop_Qt_5_14_2_MinGW_64_bit-Debug 1 @@ -307,14 +324,14 @@ ProjectExplorer.Project.Target.1 - Desktop Qt 5.14.2 MinGW 64-bit - Desktop Qt 5.14.2 MinGW 64-bit - qt.qt5.5142.win64_mingw73_kit + 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:/work/code/BJJZ/svntest/softwareDirectory/build-AutoVerScheme-Desktop_Qt_5_14_2_MinGW_64_bit-Debug + D:/dev/software/softwareDirectory/build-AutoVerScheme-Desktop_Qt_5_14_2_MinGW_32_bit-Debug true @@ -362,7 +379,7 @@ 2 - D:/work/code/BJJZ/svntest/softwareDirectory/build-AutoVerScheme-Desktop_Qt_5_14_2_MinGW_64_bit-Release + D:/dev/software/softwareDirectory/build-AutoVerScheme-Desktop_Qt_5_14_2_MinGW_32_bit-Release true @@ -410,7 +427,7 @@ 0 - D:/work/code/BJJZ/svntest/softwareDirectory/build-AutoVerScheme-Desktop_Qt_5_14_2_MinGW_64_bit-Profile + D:/dev/software/softwareDirectory/build-AutoVerScheme-Desktop_Qt_5_14_2_MinGW_32_bit-Profile true @@ -530,14 +547,14 @@ 2 - - ProjectExplorer.CustomExecutableRunConfiguration - + Qt4ProjectManager.Qt4RunConfiguration:D:/dev/software/softwareDirectory/AutoVerScheme/AutoVerScheme.pro + D:/dev/software/softwareDirectory/AutoVerScheme/AutoVerScheme.pro false false true + true false false true diff --git a/softwareDirectory/AutoVerScheme/AutoVerScheme.pro.user.94e4c4a b/softwareDirectory/AutoVerScheme/AutoVerScheme.pro.user.94e4c4a new file mode 100644 index 0000000..742ac25 --- /dev/null +++ b/softwareDirectory/AutoVerScheme/AutoVerScheme.pro.user.94e4c4a @@ -0,0 +1,562 @@ + + + + + + EnvironmentId + {94e4c4a1-54d4-412c-b108-da01d63f0d97} + + + 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 32-bit + Desktop Qt 5.14.2 MinGW 32-bit + qt.qt5.5142.win32_mingw73_kit + 0 + 0 + 0 + + D:/work/code/BJJZ/svntest/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:/work/code/BJJZ/svntest/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:/work/code/BJJZ/svntest/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:/work/code/BJJZ/svntest/softwareDirectory/AutoVerScheme/AutoVerScheme.pro + D:/work/code/BJJZ/svntest/softwareDirectory/AutoVerScheme/AutoVerScheme.pro + + false + + false + true + true + false + false + true + + D:/work/code/BJJZ/svntest/softwareDirectory/build-AutoVerScheme-Desktop_Qt_5_14_2_MinGW_32_bit-Debug + + 1 + + + + ProjectExplorer.Project.Target.1 + + 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:/work/code/BJJZ/svntest/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:/work/code/BJJZ/svntest/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:/work/code/BJJZ/svntest/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 + + + ProjectExplorer.CustomExecutableRunConfiguration + + + false + + false + 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 b7a7f10..4b3cb2b 100644 --- a/softwareDirectory/AutoVerScheme/AutoVerScheme.pro +++ b/softwareDirectory/AutoVerScheme/AutoVerScheme.pro @@ -31,6 +31,8 @@ depar_task.cpp \ depar_task_server.cpp \ dialogcheckresult.cpp \ + formcheckpoint.cpp \ + formverypoint.cpp \ indexwindow.cpp \ infomanageview.cpp \ inspectdataitem.cpp \ @@ -66,6 +68,8 @@ depar_task.h \ depar_task_server.h \ dialogcheckresult.h \ + formcheckpoint.h \ + formverypoint.h \ indexwindow.h \ infomanageview.h \ inspectdataitem.h \ @@ -94,6 +98,8 @@ datasyncview.ui \ depar_task.ui \ dialogcheckresult.ui \ + formcheckpoint.ui \ + formverypoint.ui \ indexwindow.ui \ infomanageview.ui \ inspectdataitem.ui \ diff --git a/softwareDirectory/AutoVerScheme/AutoVerScheme.pro.user b/softwareDirectory/AutoVerScheme/AutoVerScheme.pro.user index b379c65..c5290fc 100644 --- a/softwareDirectory/AutoVerScheme/AutoVerScheme.pro.user +++ b/softwareDirectory/AutoVerScheme/AutoVerScheme.pro.user @@ -1,10 +1,10 @@ - + EnvironmentId - {94e4c4a1-54d4-412c-b108-da01d63f0d97} + {2746248a-b112-4e0f-9ae0-9e61f2a42309} ProjectExplorer.Project.ActiveTarget @@ -55,23 +55,40 @@ ProjectExplorer.Project.PluginSettings + + true + true + true + true + + 0 + true -fno-delayed-template-parsing true + + true + Builtin.TidyAndClazy + 4 + + + + true + ProjectExplorer.Project.Target.0 - Desktop Qt 5.14.2 MinGW 32-bit - Desktop Qt 5.14.2 MinGW 32-bit - qt.qt5.5142.win32_mingw73_kit + 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:/work/code/BJJZ/svntest/softwareDirectory/build-AutoVerScheme-Desktop_Qt_5_14_2_MinGW_32_bit-Debug + D:/dev/software/softwareDirectory/build-AutoVerScheme-Desktop_Qt_5_14_2_MinGW_64_bit-Debug true @@ -119,7 +136,7 @@ 2 - D:/work/code/BJJZ/svntest/softwareDirectory/build-AutoVerScheme-Desktop_Qt_5_14_2_MinGW_32_bit-Release + D:/dev/software/softwareDirectory/build-AutoVerScheme-Desktop_Qt_5_14_2_MinGW_64_bit-Release true @@ -167,7 +184,7 @@ 0 - D:/work/code/BJJZ/svntest/softwareDirectory/build-AutoVerScheme-Desktop_Qt_5_14_2_MinGW_32_bit-Profile + D:/dev/software/softwareDirectory/build-AutoVerScheme-Desktop_Qt_5_14_2_MinGW_64_bit-Profile true @@ -287,8 +304,8 @@ 2 - Qt4ProjectManager.Qt4RunConfiguration:D:/work/code/BJJZ/svntest/softwareDirectory/AutoVerScheme/AutoVerScheme.pro - D:/work/code/BJJZ/svntest/softwareDirectory/AutoVerScheme/AutoVerScheme.pro + Qt4ProjectManager.Qt4RunConfiguration:D:/dev/software/softwareDirectory/AutoVerScheme/AutoVerScheme.pro + D:/dev/software/softwareDirectory/AutoVerScheme/AutoVerScheme.pro false @@ -299,7 +316,7 @@ false true - D:/work/code/BJJZ/svntest/softwareDirectory/build-AutoVerScheme-Desktop_Qt_5_14_2_MinGW_32_bit-Debug + D:/dev/software/softwareDirectory/build-AutoVerScheme-Desktop_Qt_5_14_2_MinGW_64_bit-Debug 1 @@ -307,14 +324,14 @@ ProjectExplorer.Project.Target.1 - Desktop Qt 5.14.2 MinGW 64-bit - Desktop Qt 5.14.2 MinGW 64-bit - qt.qt5.5142.win64_mingw73_kit + 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:/work/code/BJJZ/svntest/softwareDirectory/build-AutoVerScheme-Desktop_Qt_5_14_2_MinGW_64_bit-Debug + D:/dev/software/softwareDirectory/build-AutoVerScheme-Desktop_Qt_5_14_2_MinGW_32_bit-Debug true @@ -362,7 +379,7 @@ 2 - D:/work/code/BJJZ/svntest/softwareDirectory/build-AutoVerScheme-Desktop_Qt_5_14_2_MinGW_64_bit-Release + D:/dev/software/softwareDirectory/build-AutoVerScheme-Desktop_Qt_5_14_2_MinGW_32_bit-Release true @@ -410,7 +427,7 @@ 0 - D:/work/code/BJJZ/svntest/softwareDirectory/build-AutoVerScheme-Desktop_Qt_5_14_2_MinGW_64_bit-Profile + D:/dev/software/softwareDirectory/build-AutoVerScheme-Desktop_Qt_5_14_2_MinGW_32_bit-Profile true @@ -530,14 +547,14 @@ 2 - - ProjectExplorer.CustomExecutableRunConfiguration - + Qt4ProjectManager.Qt4RunConfiguration:D:/dev/software/softwareDirectory/AutoVerScheme/AutoVerScheme.pro + D:/dev/software/softwareDirectory/AutoVerScheme/AutoVerScheme.pro false false true + true false false true diff --git a/softwareDirectory/AutoVerScheme/AutoVerScheme.pro.user.94e4c4a b/softwareDirectory/AutoVerScheme/AutoVerScheme.pro.user.94e4c4a new file mode 100644 index 0000000..742ac25 --- /dev/null +++ b/softwareDirectory/AutoVerScheme/AutoVerScheme.pro.user.94e4c4a @@ -0,0 +1,562 @@ + + + + + + EnvironmentId + {94e4c4a1-54d4-412c-b108-da01d63f0d97} + + + 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 32-bit + Desktop Qt 5.14.2 MinGW 32-bit + qt.qt5.5142.win32_mingw73_kit + 0 + 0 + 0 + + D:/work/code/BJJZ/svntest/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:/work/code/BJJZ/svntest/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:/work/code/BJJZ/svntest/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:/work/code/BJJZ/svntest/softwareDirectory/AutoVerScheme/AutoVerScheme.pro + D:/work/code/BJJZ/svntest/softwareDirectory/AutoVerScheme/AutoVerScheme.pro + + false + + false + true + true + false + false + true + + D:/work/code/BJJZ/svntest/softwareDirectory/build-AutoVerScheme-Desktop_Qt_5_14_2_MinGW_32_bit-Debug + + 1 + + + + ProjectExplorer.Project.Target.1 + + 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:/work/code/BJJZ/svntest/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:/work/code/BJJZ/svntest/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:/work/code/BJJZ/svntest/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 + + + ProjectExplorer.CustomExecutableRunConfiguration + + + false + + false + true + false + false + true + + + + 1 + + + + ProjectExplorer.Project.TargetCount + 2 + + + ProjectExplorer.Project.Updater.FileVersion + 22 + + + Version + 22 + + diff --git a/softwareDirectory/AutoVerScheme/checkdevice.cpp b/softwareDirectory/AutoVerScheme/checkdevice.cpp index 5497af2..d540aa6 100644 --- a/softwareDirectory/AutoVerScheme/checkdevice.cpp +++ b/softwareDirectory/AutoVerScheme/checkdevice.cpp @@ -14,6 +14,7 @@ ui->tableWidget_4->setColumnWidth(0, 80); for(int i=1;i<5;i++) ui->tableWidget_4->horizontalHeader()->setSectionResizeMode(i,QHeaderView::Stretch); + getCheckDevice(); getStandardDevice(); } @@ -22,6 +23,23 @@ delete ui; } +void CheckDevice::getCheckDevice() +{ + int rowCount=0; + int row=0; + QList data = BaseCommonApi::getTestedDevice(); + for (const TestedDevice& bizDevice : data) { + rowCount = ui->tableWidget_3->rowCount(); + ui->tableWidget_3->insertRow(rowCount); + QCheckBox *checkBox = new QCheckBox; + ui->tableWidget_3->setCellWidget(row, 0, checkBox); + ui->tableWidget_4->setItem(row, 1, new QTableWidgetItem(bizDevice.equipment_name)); + ui->tableWidget_4->setItem(row, 2, new QTableWidgetItem(bizDevice.model)); + ui->tableWidget_4->setItem(row, 3, new QTableWidgetItem(bizDevice.help_instruction)); + row++; + } +} + void CheckDevice::getStandardDevice() { int rowCount=0; diff --git a/softwareDirectory/AutoVerScheme/AutoVerScheme.pro b/softwareDirectory/AutoVerScheme/AutoVerScheme.pro index b7a7f10..4b3cb2b 100644 --- a/softwareDirectory/AutoVerScheme/AutoVerScheme.pro +++ b/softwareDirectory/AutoVerScheme/AutoVerScheme.pro @@ -31,6 +31,8 @@ depar_task.cpp \ depar_task_server.cpp \ dialogcheckresult.cpp \ + formcheckpoint.cpp \ + formverypoint.cpp \ indexwindow.cpp \ infomanageview.cpp \ inspectdataitem.cpp \ @@ -66,6 +68,8 @@ depar_task.h \ depar_task_server.h \ dialogcheckresult.h \ + formcheckpoint.h \ + formverypoint.h \ indexwindow.h \ infomanageview.h \ inspectdataitem.h \ @@ -94,6 +98,8 @@ datasyncview.ui \ depar_task.ui \ dialogcheckresult.ui \ + formcheckpoint.ui \ + formverypoint.ui \ indexwindow.ui \ infomanageview.ui \ inspectdataitem.ui \ diff --git a/softwareDirectory/AutoVerScheme/AutoVerScheme.pro.user b/softwareDirectory/AutoVerScheme/AutoVerScheme.pro.user index b379c65..c5290fc 100644 --- a/softwareDirectory/AutoVerScheme/AutoVerScheme.pro.user +++ b/softwareDirectory/AutoVerScheme/AutoVerScheme.pro.user @@ -1,10 +1,10 @@ - + EnvironmentId - {94e4c4a1-54d4-412c-b108-da01d63f0d97} + {2746248a-b112-4e0f-9ae0-9e61f2a42309} ProjectExplorer.Project.ActiveTarget @@ -55,23 +55,40 @@ ProjectExplorer.Project.PluginSettings + + true + true + true + true + + 0 + true -fno-delayed-template-parsing true + + true + Builtin.TidyAndClazy + 4 + + + + true + ProjectExplorer.Project.Target.0 - Desktop Qt 5.14.2 MinGW 32-bit - Desktop Qt 5.14.2 MinGW 32-bit - qt.qt5.5142.win32_mingw73_kit + 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:/work/code/BJJZ/svntest/softwareDirectory/build-AutoVerScheme-Desktop_Qt_5_14_2_MinGW_32_bit-Debug + D:/dev/software/softwareDirectory/build-AutoVerScheme-Desktop_Qt_5_14_2_MinGW_64_bit-Debug true @@ -119,7 +136,7 @@ 2 - D:/work/code/BJJZ/svntest/softwareDirectory/build-AutoVerScheme-Desktop_Qt_5_14_2_MinGW_32_bit-Release + D:/dev/software/softwareDirectory/build-AutoVerScheme-Desktop_Qt_5_14_2_MinGW_64_bit-Release true @@ -167,7 +184,7 @@ 0 - D:/work/code/BJJZ/svntest/softwareDirectory/build-AutoVerScheme-Desktop_Qt_5_14_2_MinGW_32_bit-Profile + D:/dev/software/softwareDirectory/build-AutoVerScheme-Desktop_Qt_5_14_2_MinGW_64_bit-Profile true @@ -287,8 +304,8 @@ 2 - Qt4ProjectManager.Qt4RunConfiguration:D:/work/code/BJJZ/svntest/softwareDirectory/AutoVerScheme/AutoVerScheme.pro - D:/work/code/BJJZ/svntest/softwareDirectory/AutoVerScheme/AutoVerScheme.pro + Qt4ProjectManager.Qt4RunConfiguration:D:/dev/software/softwareDirectory/AutoVerScheme/AutoVerScheme.pro + D:/dev/software/softwareDirectory/AutoVerScheme/AutoVerScheme.pro false @@ -299,7 +316,7 @@ false true - D:/work/code/BJJZ/svntest/softwareDirectory/build-AutoVerScheme-Desktop_Qt_5_14_2_MinGW_32_bit-Debug + D:/dev/software/softwareDirectory/build-AutoVerScheme-Desktop_Qt_5_14_2_MinGW_64_bit-Debug 1 @@ -307,14 +324,14 @@ ProjectExplorer.Project.Target.1 - Desktop Qt 5.14.2 MinGW 64-bit - Desktop Qt 5.14.2 MinGW 64-bit - qt.qt5.5142.win64_mingw73_kit + 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:/work/code/BJJZ/svntest/softwareDirectory/build-AutoVerScheme-Desktop_Qt_5_14_2_MinGW_64_bit-Debug + D:/dev/software/softwareDirectory/build-AutoVerScheme-Desktop_Qt_5_14_2_MinGW_32_bit-Debug true @@ -362,7 +379,7 @@ 2 - D:/work/code/BJJZ/svntest/softwareDirectory/build-AutoVerScheme-Desktop_Qt_5_14_2_MinGW_64_bit-Release + D:/dev/software/softwareDirectory/build-AutoVerScheme-Desktop_Qt_5_14_2_MinGW_32_bit-Release true @@ -410,7 +427,7 @@ 0 - D:/work/code/BJJZ/svntest/softwareDirectory/build-AutoVerScheme-Desktop_Qt_5_14_2_MinGW_64_bit-Profile + D:/dev/software/softwareDirectory/build-AutoVerScheme-Desktop_Qt_5_14_2_MinGW_32_bit-Profile true @@ -530,14 +547,14 @@ 2 - - ProjectExplorer.CustomExecutableRunConfiguration - + Qt4ProjectManager.Qt4RunConfiguration:D:/dev/software/softwareDirectory/AutoVerScheme/AutoVerScheme.pro + D:/dev/software/softwareDirectory/AutoVerScheme/AutoVerScheme.pro false false true + true false false true diff --git a/softwareDirectory/AutoVerScheme/AutoVerScheme.pro.user.94e4c4a b/softwareDirectory/AutoVerScheme/AutoVerScheme.pro.user.94e4c4a new file mode 100644 index 0000000..742ac25 --- /dev/null +++ b/softwareDirectory/AutoVerScheme/AutoVerScheme.pro.user.94e4c4a @@ -0,0 +1,562 @@ + + + + + + EnvironmentId + {94e4c4a1-54d4-412c-b108-da01d63f0d97} + + + 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 32-bit + Desktop Qt 5.14.2 MinGW 32-bit + qt.qt5.5142.win32_mingw73_kit + 0 + 0 + 0 + + D:/work/code/BJJZ/svntest/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:/work/code/BJJZ/svntest/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:/work/code/BJJZ/svntest/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:/work/code/BJJZ/svntest/softwareDirectory/AutoVerScheme/AutoVerScheme.pro + D:/work/code/BJJZ/svntest/softwareDirectory/AutoVerScheme/AutoVerScheme.pro + + false + + false + true + true + false + false + true + + D:/work/code/BJJZ/svntest/softwareDirectory/build-AutoVerScheme-Desktop_Qt_5_14_2_MinGW_32_bit-Debug + + 1 + + + + ProjectExplorer.Project.Target.1 + + 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:/work/code/BJJZ/svntest/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:/work/code/BJJZ/svntest/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:/work/code/BJJZ/svntest/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 + + + ProjectExplorer.CustomExecutableRunConfiguration + + + false + + false + true + false + false + true + + + + 1 + + + + ProjectExplorer.Project.TargetCount + 2 + + + ProjectExplorer.Project.Updater.FileVersion + 22 + + + Version + 22 + + diff --git a/softwareDirectory/AutoVerScheme/checkdevice.cpp b/softwareDirectory/AutoVerScheme/checkdevice.cpp index 5497af2..d540aa6 100644 --- a/softwareDirectory/AutoVerScheme/checkdevice.cpp +++ b/softwareDirectory/AutoVerScheme/checkdevice.cpp @@ -14,6 +14,7 @@ ui->tableWidget_4->setColumnWidth(0, 80); for(int i=1;i<5;i++) ui->tableWidget_4->horizontalHeader()->setSectionResizeMode(i,QHeaderView::Stretch); + getCheckDevice(); getStandardDevice(); } @@ -22,6 +23,23 @@ delete ui; } +void CheckDevice::getCheckDevice() +{ + int rowCount=0; + int row=0; + QList data = BaseCommonApi::getTestedDevice(); + for (const TestedDevice& bizDevice : data) { + rowCount = ui->tableWidget_3->rowCount(); + ui->tableWidget_3->insertRow(rowCount); + QCheckBox *checkBox = new QCheckBox; + ui->tableWidget_3->setCellWidget(row, 0, checkBox); + ui->tableWidget_4->setItem(row, 1, new QTableWidgetItem(bizDevice.equipment_name)); + ui->tableWidget_4->setItem(row, 2, new QTableWidgetItem(bizDevice.model)); + ui->tableWidget_4->setItem(row, 3, new QTableWidgetItem(bizDevice.help_instruction)); + row++; + } +} + void CheckDevice::getStandardDevice() { int rowCount=0; diff --git a/softwareDirectory/AutoVerScheme/checkdevice.h b/softwareDirectory/AutoVerScheme/checkdevice.h index fc42d90..8102d24 100644 --- a/softwareDirectory/AutoVerScheme/checkdevice.h +++ b/softwareDirectory/AutoVerScheme/checkdevice.h @@ -16,6 +16,7 @@ ~CheckDevice(); private: + void getCheckDevice(); void getStandardDevice(); private: diff --git a/softwareDirectory/AutoVerScheme/AutoVerScheme.pro b/softwareDirectory/AutoVerScheme/AutoVerScheme.pro index b7a7f10..4b3cb2b 100644 --- a/softwareDirectory/AutoVerScheme/AutoVerScheme.pro +++ b/softwareDirectory/AutoVerScheme/AutoVerScheme.pro @@ -31,6 +31,8 @@ depar_task.cpp \ depar_task_server.cpp \ dialogcheckresult.cpp \ + formcheckpoint.cpp \ + formverypoint.cpp \ indexwindow.cpp \ infomanageview.cpp \ inspectdataitem.cpp \ @@ -66,6 +68,8 @@ depar_task.h \ depar_task_server.h \ dialogcheckresult.h \ + formcheckpoint.h \ + formverypoint.h \ indexwindow.h \ infomanageview.h \ inspectdataitem.h \ @@ -94,6 +98,8 @@ datasyncview.ui \ depar_task.ui \ dialogcheckresult.ui \ + formcheckpoint.ui \ + formverypoint.ui \ indexwindow.ui \ infomanageview.ui \ inspectdataitem.ui \ diff --git a/softwareDirectory/AutoVerScheme/AutoVerScheme.pro.user b/softwareDirectory/AutoVerScheme/AutoVerScheme.pro.user index b379c65..c5290fc 100644 --- a/softwareDirectory/AutoVerScheme/AutoVerScheme.pro.user +++ b/softwareDirectory/AutoVerScheme/AutoVerScheme.pro.user @@ -1,10 +1,10 @@ - + EnvironmentId - {94e4c4a1-54d4-412c-b108-da01d63f0d97} + {2746248a-b112-4e0f-9ae0-9e61f2a42309} ProjectExplorer.Project.ActiveTarget @@ -55,23 +55,40 @@ ProjectExplorer.Project.PluginSettings + + true + true + true + true + + 0 + true -fno-delayed-template-parsing true + + true + Builtin.TidyAndClazy + 4 + + + + true + ProjectExplorer.Project.Target.0 - Desktop Qt 5.14.2 MinGW 32-bit - Desktop Qt 5.14.2 MinGW 32-bit - qt.qt5.5142.win32_mingw73_kit + 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:/work/code/BJJZ/svntest/softwareDirectory/build-AutoVerScheme-Desktop_Qt_5_14_2_MinGW_32_bit-Debug + D:/dev/software/softwareDirectory/build-AutoVerScheme-Desktop_Qt_5_14_2_MinGW_64_bit-Debug true @@ -119,7 +136,7 @@ 2 - D:/work/code/BJJZ/svntest/softwareDirectory/build-AutoVerScheme-Desktop_Qt_5_14_2_MinGW_32_bit-Release + D:/dev/software/softwareDirectory/build-AutoVerScheme-Desktop_Qt_5_14_2_MinGW_64_bit-Release true @@ -167,7 +184,7 @@ 0 - D:/work/code/BJJZ/svntest/softwareDirectory/build-AutoVerScheme-Desktop_Qt_5_14_2_MinGW_32_bit-Profile + D:/dev/software/softwareDirectory/build-AutoVerScheme-Desktop_Qt_5_14_2_MinGW_64_bit-Profile true @@ -287,8 +304,8 @@ 2 - Qt4ProjectManager.Qt4RunConfiguration:D:/work/code/BJJZ/svntest/softwareDirectory/AutoVerScheme/AutoVerScheme.pro - D:/work/code/BJJZ/svntest/softwareDirectory/AutoVerScheme/AutoVerScheme.pro + Qt4ProjectManager.Qt4RunConfiguration:D:/dev/software/softwareDirectory/AutoVerScheme/AutoVerScheme.pro + D:/dev/software/softwareDirectory/AutoVerScheme/AutoVerScheme.pro false @@ -299,7 +316,7 @@ false true - D:/work/code/BJJZ/svntest/softwareDirectory/build-AutoVerScheme-Desktop_Qt_5_14_2_MinGW_32_bit-Debug + D:/dev/software/softwareDirectory/build-AutoVerScheme-Desktop_Qt_5_14_2_MinGW_64_bit-Debug 1 @@ -307,14 +324,14 @@ ProjectExplorer.Project.Target.1 - Desktop Qt 5.14.2 MinGW 64-bit - Desktop Qt 5.14.2 MinGW 64-bit - qt.qt5.5142.win64_mingw73_kit + 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:/work/code/BJJZ/svntest/softwareDirectory/build-AutoVerScheme-Desktop_Qt_5_14_2_MinGW_64_bit-Debug + D:/dev/software/softwareDirectory/build-AutoVerScheme-Desktop_Qt_5_14_2_MinGW_32_bit-Debug true @@ -362,7 +379,7 @@ 2 - D:/work/code/BJJZ/svntest/softwareDirectory/build-AutoVerScheme-Desktop_Qt_5_14_2_MinGW_64_bit-Release + D:/dev/software/softwareDirectory/build-AutoVerScheme-Desktop_Qt_5_14_2_MinGW_32_bit-Release true @@ -410,7 +427,7 @@ 0 - D:/work/code/BJJZ/svntest/softwareDirectory/build-AutoVerScheme-Desktop_Qt_5_14_2_MinGW_64_bit-Profile + D:/dev/software/softwareDirectory/build-AutoVerScheme-Desktop_Qt_5_14_2_MinGW_32_bit-Profile true @@ -530,14 +547,14 @@ 2 - - ProjectExplorer.CustomExecutableRunConfiguration - + Qt4ProjectManager.Qt4RunConfiguration:D:/dev/software/softwareDirectory/AutoVerScheme/AutoVerScheme.pro + D:/dev/software/softwareDirectory/AutoVerScheme/AutoVerScheme.pro false false true + true false false true diff --git a/softwareDirectory/AutoVerScheme/AutoVerScheme.pro.user.94e4c4a b/softwareDirectory/AutoVerScheme/AutoVerScheme.pro.user.94e4c4a new file mode 100644 index 0000000..742ac25 --- /dev/null +++ b/softwareDirectory/AutoVerScheme/AutoVerScheme.pro.user.94e4c4a @@ -0,0 +1,562 @@ + + + + + + EnvironmentId + {94e4c4a1-54d4-412c-b108-da01d63f0d97} + + + 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 32-bit + Desktop Qt 5.14.2 MinGW 32-bit + qt.qt5.5142.win32_mingw73_kit + 0 + 0 + 0 + + D:/work/code/BJJZ/svntest/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:/work/code/BJJZ/svntest/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:/work/code/BJJZ/svntest/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:/work/code/BJJZ/svntest/softwareDirectory/AutoVerScheme/AutoVerScheme.pro + D:/work/code/BJJZ/svntest/softwareDirectory/AutoVerScheme/AutoVerScheme.pro + + false + + false + true + true + false + false + true + + D:/work/code/BJJZ/svntest/softwareDirectory/build-AutoVerScheme-Desktop_Qt_5_14_2_MinGW_32_bit-Debug + + 1 + + + + ProjectExplorer.Project.Target.1 + + 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:/work/code/BJJZ/svntest/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:/work/code/BJJZ/svntest/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:/work/code/BJJZ/svntest/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 + + + ProjectExplorer.CustomExecutableRunConfiguration + + + false + + false + true + false + false + true + + + + 1 + + + + ProjectExplorer.Project.TargetCount + 2 + + + ProjectExplorer.Project.Updater.FileVersion + 22 + + + Version + 22 + + diff --git a/softwareDirectory/AutoVerScheme/checkdevice.cpp b/softwareDirectory/AutoVerScheme/checkdevice.cpp index 5497af2..d540aa6 100644 --- a/softwareDirectory/AutoVerScheme/checkdevice.cpp +++ b/softwareDirectory/AutoVerScheme/checkdevice.cpp @@ -14,6 +14,7 @@ ui->tableWidget_4->setColumnWidth(0, 80); for(int i=1;i<5;i++) ui->tableWidget_4->horizontalHeader()->setSectionResizeMode(i,QHeaderView::Stretch); + getCheckDevice(); getStandardDevice(); } @@ -22,6 +23,23 @@ delete ui; } +void CheckDevice::getCheckDevice() +{ + int rowCount=0; + int row=0; + QList data = BaseCommonApi::getTestedDevice(); + for (const TestedDevice& bizDevice : data) { + rowCount = ui->tableWidget_3->rowCount(); + ui->tableWidget_3->insertRow(rowCount); + QCheckBox *checkBox = new QCheckBox; + ui->tableWidget_3->setCellWidget(row, 0, checkBox); + ui->tableWidget_4->setItem(row, 1, new QTableWidgetItem(bizDevice.equipment_name)); + ui->tableWidget_4->setItem(row, 2, new QTableWidgetItem(bizDevice.model)); + ui->tableWidget_4->setItem(row, 3, new QTableWidgetItem(bizDevice.help_instruction)); + row++; + } +} + void CheckDevice::getStandardDevice() { int rowCount=0; diff --git a/softwareDirectory/AutoVerScheme/checkdevice.h b/softwareDirectory/AutoVerScheme/checkdevice.h index fc42d90..8102d24 100644 --- a/softwareDirectory/AutoVerScheme/checkdevice.h +++ b/softwareDirectory/AutoVerScheme/checkdevice.h @@ -16,6 +16,7 @@ ~CheckDevice(); private: + void getCheckDevice(); void getStandardDevice(); private: diff --git a/softwareDirectory/AutoVerScheme/depar_task.cpp b/softwareDirectory/AutoVerScheme/depar_task.cpp index 5b5c3ef..ea7c6a2 100644 --- a/softwareDirectory/AutoVerScheme/depar_task.cpp +++ b/softwareDirectory/AutoVerScheme/depar_task.cpp @@ -97,7 +97,7 @@ ui->tableWidget->setItem(row, 5, new QTableWidgetItem(dept.manufacturer)); //设置数据 ui->tableWidget->setItem(row, 6, new QTableWidgetItem(dept.customer_name)); //设置数据 ui->tableWidget->setItem(row, 7, new QTableWidgetItem(dept.FULL_NAME)); //设置数据 - ui->tableWidget->setItem(row, 8, new QTableWidgetItem(dept.require_over_time)); //设置数据 + ui->tableWidget->setItem(row, 8, new QTableWidgetItem(dept.require_over_time.toString())); //设置数据 if(dept.is_urgent=="1") State="是"; else diff --git a/softwareDirectory/AutoVerScheme/AutoVerScheme.pro b/softwareDirectory/AutoVerScheme/AutoVerScheme.pro index b7a7f10..4b3cb2b 100644 --- a/softwareDirectory/AutoVerScheme/AutoVerScheme.pro +++ b/softwareDirectory/AutoVerScheme/AutoVerScheme.pro @@ -31,6 +31,8 @@ depar_task.cpp \ depar_task_server.cpp \ dialogcheckresult.cpp \ + formcheckpoint.cpp \ + formverypoint.cpp \ indexwindow.cpp \ infomanageview.cpp \ inspectdataitem.cpp \ @@ -66,6 +68,8 @@ depar_task.h \ depar_task_server.h \ dialogcheckresult.h \ + formcheckpoint.h \ + formverypoint.h \ indexwindow.h \ infomanageview.h \ inspectdataitem.h \ @@ -94,6 +98,8 @@ datasyncview.ui \ depar_task.ui \ dialogcheckresult.ui \ + formcheckpoint.ui \ + formverypoint.ui \ indexwindow.ui \ infomanageview.ui \ inspectdataitem.ui \ diff --git a/softwareDirectory/AutoVerScheme/AutoVerScheme.pro.user b/softwareDirectory/AutoVerScheme/AutoVerScheme.pro.user index b379c65..c5290fc 100644 --- a/softwareDirectory/AutoVerScheme/AutoVerScheme.pro.user +++ b/softwareDirectory/AutoVerScheme/AutoVerScheme.pro.user @@ -1,10 +1,10 @@ - + EnvironmentId - {94e4c4a1-54d4-412c-b108-da01d63f0d97} + {2746248a-b112-4e0f-9ae0-9e61f2a42309} ProjectExplorer.Project.ActiveTarget @@ -55,23 +55,40 @@ ProjectExplorer.Project.PluginSettings + + true + true + true + true + + 0 + true -fno-delayed-template-parsing true + + true + Builtin.TidyAndClazy + 4 + + + + true + ProjectExplorer.Project.Target.0 - Desktop Qt 5.14.2 MinGW 32-bit - Desktop Qt 5.14.2 MinGW 32-bit - qt.qt5.5142.win32_mingw73_kit + 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:/work/code/BJJZ/svntest/softwareDirectory/build-AutoVerScheme-Desktop_Qt_5_14_2_MinGW_32_bit-Debug + D:/dev/software/softwareDirectory/build-AutoVerScheme-Desktop_Qt_5_14_2_MinGW_64_bit-Debug true @@ -119,7 +136,7 @@ 2 - D:/work/code/BJJZ/svntest/softwareDirectory/build-AutoVerScheme-Desktop_Qt_5_14_2_MinGW_32_bit-Release + D:/dev/software/softwareDirectory/build-AutoVerScheme-Desktop_Qt_5_14_2_MinGW_64_bit-Release true @@ -167,7 +184,7 @@ 0 - D:/work/code/BJJZ/svntest/softwareDirectory/build-AutoVerScheme-Desktop_Qt_5_14_2_MinGW_32_bit-Profile + D:/dev/software/softwareDirectory/build-AutoVerScheme-Desktop_Qt_5_14_2_MinGW_64_bit-Profile true @@ -287,8 +304,8 @@ 2 - Qt4ProjectManager.Qt4RunConfiguration:D:/work/code/BJJZ/svntest/softwareDirectory/AutoVerScheme/AutoVerScheme.pro - D:/work/code/BJJZ/svntest/softwareDirectory/AutoVerScheme/AutoVerScheme.pro + Qt4ProjectManager.Qt4RunConfiguration:D:/dev/software/softwareDirectory/AutoVerScheme/AutoVerScheme.pro + D:/dev/software/softwareDirectory/AutoVerScheme/AutoVerScheme.pro false @@ -299,7 +316,7 @@ false true - D:/work/code/BJJZ/svntest/softwareDirectory/build-AutoVerScheme-Desktop_Qt_5_14_2_MinGW_32_bit-Debug + D:/dev/software/softwareDirectory/build-AutoVerScheme-Desktop_Qt_5_14_2_MinGW_64_bit-Debug 1 @@ -307,14 +324,14 @@ ProjectExplorer.Project.Target.1 - Desktop Qt 5.14.2 MinGW 64-bit - Desktop Qt 5.14.2 MinGW 64-bit - qt.qt5.5142.win64_mingw73_kit + 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:/work/code/BJJZ/svntest/softwareDirectory/build-AutoVerScheme-Desktop_Qt_5_14_2_MinGW_64_bit-Debug + D:/dev/software/softwareDirectory/build-AutoVerScheme-Desktop_Qt_5_14_2_MinGW_32_bit-Debug true @@ -362,7 +379,7 @@ 2 - D:/work/code/BJJZ/svntest/softwareDirectory/build-AutoVerScheme-Desktop_Qt_5_14_2_MinGW_64_bit-Release + D:/dev/software/softwareDirectory/build-AutoVerScheme-Desktop_Qt_5_14_2_MinGW_32_bit-Release true @@ -410,7 +427,7 @@ 0 - D:/work/code/BJJZ/svntest/softwareDirectory/build-AutoVerScheme-Desktop_Qt_5_14_2_MinGW_64_bit-Profile + D:/dev/software/softwareDirectory/build-AutoVerScheme-Desktop_Qt_5_14_2_MinGW_32_bit-Profile true @@ -530,14 +547,14 @@ 2 - - ProjectExplorer.CustomExecutableRunConfiguration - + Qt4ProjectManager.Qt4RunConfiguration:D:/dev/software/softwareDirectory/AutoVerScheme/AutoVerScheme.pro + D:/dev/software/softwareDirectory/AutoVerScheme/AutoVerScheme.pro false false true + true false false true diff --git a/softwareDirectory/AutoVerScheme/AutoVerScheme.pro.user.94e4c4a b/softwareDirectory/AutoVerScheme/AutoVerScheme.pro.user.94e4c4a new file mode 100644 index 0000000..742ac25 --- /dev/null +++ b/softwareDirectory/AutoVerScheme/AutoVerScheme.pro.user.94e4c4a @@ -0,0 +1,562 @@ + + + + + + EnvironmentId + {94e4c4a1-54d4-412c-b108-da01d63f0d97} + + + 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 32-bit + Desktop Qt 5.14.2 MinGW 32-bit + qt.qt5.5142.win32_mingw73_kit + 0 + 0 + 0 + + D:/work/code/BJJZ/svntest/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:/work/code/BJJZ/svntest/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:/work/code/BJJZ/svntest/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:/work/code/BJJZ/svntest/softwareDirectory/AutoVerScheme/AutoVerScheme.pro + D:/work/code/BJJZ/svntest/softwareDirectory/AutoVerScheme/AutoVerScheme.pro + + false + + false + true + true + false + false + true + + D:/work/code/BJJZ/svntest/softwareDirectory/build-AutoVerScheme-Desktop_Qt_5_14_2_MinGW_32_bit-Debug + + 1 + + + + ProjectExplorer.Project.Target.1 + + 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:/work/code/BJJZ/svntest/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:/work/code/BJJZ/svntest/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:/work/code/BJJZ/svntest/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 + + + ProjectExplorer.CustomExecutableRunConfiguration + + + false + + false + true + false + false + true + + + + 1 + + + + ProjectExplorer.Project.TargetCount + 2 + + + ProjectExplorer.Project.Updater.FileVersion + 22 + + + Version + 22 + + diff --git a/softwareDirectory/AutoVerScheme/checkdevice.cpp b/softwareDirectory/AutoVerScheme/checkdevice.cpp index 5497af2..d540aa6 100644 --- a/softwareDirectory/AutoVerScheme/checkdevice.cpp +++ b/softwareDirectory/AutoVerScheme/checkdevice.cpp @@ -14,6 +14,7 @@ ui->tableWidget_4->setColumnWidth(0, 80); for(int i=1;i<5;i++) ui->tableWidget_4->horizontalHeader()->setSectionResizeMode(i,QHeaderView::Stretch); + getCheckDevice(); getStandardDevice(); } @@ -22,6 +23,23 @@ delete ui; } +void CheckDevice::getCheckDevice() +{ + int rowCount=0; + int row=0; + QList data = BaseCommonApi::getTestedDevice(); + for (const TestedDevice& bizDevice : data) { + rowCount = ui->tableWidget_3->rowCount(); + ui->tableWidget_3->insertRow(rowCount); + QCheckBox *checkBox = new QCheckBox; + ui->tableWidget_3->setCellWidget(row, 0, checkBox); + ui->tableWidget_4->setItem(row, 1, new QTableWidgetItem(bizDevice.equipment_name)); + ui->tableWidget_4->setItem(row, 2, new QTableWidgetItem(bizDevice.model)); + ui->tableWidget_4->setItem(row, 3, new QTableWidgetItem(bizDevice.help_instruction)); + row++; + } +} + void CheckDevice::getStandardDevice() { int rowCount=0; diff --git a/softwareDirectory/AutoVerScheme/checkdevice.h b/softwareDirectory/AutoVerScheme/checkdevice.h index fc42d90..8102d24 100644 --- a/softwareDirectory/AutoVerScheme/checkdevice.h +++ b/softwareDirectory/AutoVerScheme/checkdevice.h @@ -16,6 +16,7 @@ ~CheckDevice(); private: + void getCheckDevice(); void getStandardDevice(); private: diff --git a/softwareDirectory/AutoVerScheme/depar_task.cpp b/softwareDirectory/AutoVerScheme/depar_task.cpp index 5b5c3ef..ea7c6a2 100644 --- a/softwareDirectory/AutoVerScheme/depar_task.cpp +++ b/softwareDirectory/AutoVerScheme/depar_task.cpp @@ -97,7 +97,7 @@ ui->tableWidget->setItem(row, 5, new QTableWidgetItem(dept.manufacturer)); //设置数据 ui->tableWidget->setItem(row, 6, new QTableWidgetItem(dept.customer_name)); //设置数据 ui->tableWidget->setItem(row, 7, new QTableWidgetItem(dept.FULL_NAME)); //设置数据 - ui->tableWidget->setItem(row, 8, new QTableWidgetItem(dept.require_over_time)); //设置数据 + ui->tableWidget->setItem(row, 8, new QTableWidgetItem(dept.require_over_time.toString())); //设置数据 if(dept.is_urgent=="1") State="是"; else diff --git a/softwareDirectory/AutoVerScheme/formcheckpoint.cpp b/softwareDirectory/AutoVerScheme/formcheckpoint.cpp new file mode 100644 index 0000000..5ff2d74 --- /dev/null +++ b/softwareDirectory/AutoVerScheme/formcheckpoint.cpp @@ -0,0 +1,14 @@ +#include "formcheckpoint.h" +#include "ui_formcheckpoint.h" + +FormCheckPoint::FormCheckPoint(QWidget *parent) : + QWidget(parent), + ui(new Ui::FormCheckPoint) +{ + ui->setupUi(this); +} + +FormCheckPoint::~FormCheckPoint() +{ + delete ui; +} diff --git a/softwareDirectory/AutoVerScheme/AutoVerScheme.pro b/softwareDirectory/AutoVerScheme/AutoVerScheme.pro index b7a7f10..4b3cb2b 100644 --- a/softwareDirectory/AutoVerScheme/AutoVerScheme.pro +++ b/softwareDirectory/AutoVerScheme/AutoVerScheme.pro @@ -31,6 +31,8 @@ depar_task.cpp \ depar_task_server.cpp \ dialogcheckresult.cpp \ + formcheckpoint.cpp \ + formverypoint.cpp \ indexwindow.cpp \ infomanageview.cpp \ inspectdataitem.cpp \ @@ -66,6 +68,8 @@ depar_task.h \ depar_task_server.h \ dialogcheckresult.h \ + formcheckpoint.h \ + formverypoint.h \ indexwindow.h \ infomanageview.h \ inspectdataitem.h \ @@ -94,6 +98,8 @@ datasyncview.ui \ depar_task.ui \ dialogcheckresult.ui \ + formcheckpoint.ui \ + formverypoint.ui \ indexwindow.ui \ infomanageview.ui \ inspectdataitem.ui \ diff --git a/softwareDirectory/AutoVerScheme/AutoVerScheme.pro.user b/softwareDirectory/AutoVerScheme/AutoVerScheme.pro.user index b379c65..c5290fc 100644 --- a/softwareDirectory/AutoVerScheme/AutoVerScheme.pro.user +++ b/softwareDirectory/AutoVerScheme/AutoVerScheme.pro.user @@ -1,10 +1,10 @@ - + EnvironmentId - {94e4c4a1-54d4-412c-b108-da01d63f0d97} + {2746248a-b112-4e0f-9ae0-9e61f2a42309} ProjectExplorer.Project.ActiveTarget @@ -55,23 +55,40 @@ ProjectExplorer.Project.PluginSettings + + true + true + true + true + + 0 + true -fno-delayed-template-parsing true + + true + Builtin.TidyAndClazy + 4 + + + + true + ProjectExplorer.Project.Target.0 - Desktop Qt 5.14.2 MinGW 32-bit - Desktop Qt 5.14.2 MinGW 32-bit - qt.qt5.5142.win32_mingw73_kit + 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:/work/code/BJJZ/svntest/softwareDirectory/build-AutoVerScheme-Desktop_Qt_5_14_2_MinGW_32_bit-Debug + D:/dev/software/softwareDirectory/build-AutoVerScheme-Desktop_Qt_5_14_2_MinGW_64_bit-Debug true @@ -119,7 +136,7 @@ 2 - D:/work/code/BJJZ/svntest/softwareDirectory/build-AutoVerScheme-Desktop_Qt_5_14_2_MinGW_32_bit-Release + D:/dev/software/softwareDirectory/build-AutoVerScheme-Desktop_Qt_5_14_2_MinGW_64_bit-Release true @@ -167,7 +184,7 @@ 0 - D:/work/code/BJJZ/svntest/softwareDirectory/build-AutoVerScheme-Desktop_Qt_5_14_2_MinGW_32_bit-Profile + D:/dev/software/softwareDirectory/build-AutoVerScheme-Desktop_Qt_5_14_2_MinGW_64_bit-Profile true @@ -287,8 +304,8 @@ 2 - Qt4ProjectManager.Qt4RunConfiguration:D:/work/code/BJJZ/svntest/softwareDirectory/AutoVerScheme/AutoVerScheme.pro - D:/work/code/BJJZ/svntest/softwareDirectory/AutoVerScheme/AutoVerScheme.pro + Qt4ProjectManager.Qt4RunConfiguration:D:/dev/software/softwareDirectory/AutoVerScheme/AutoVerScheme.pro + D:/dev/software/softwareDirectory/AutoVerScheme/AutoVerScheme.pro false @@ -299,7 +316,7 @@ false true - D:/work/code/BJJZ/svntest/softwareDirectory/build-AutoVerScheme-Desktop_Qt_5_14_2_MinGW_32_bit-Debug + D:/dev/software/softwareDirectory/build-AutoVerScheme-Desktop_Qt_5_14_2_MinGW_64_bit-Debug 1 @@ -307,14 +324,14 @@ ProjectExplorer.Project.Target.1 - Desktop Qt 5.14.2 MinGW 64-bit - Desktop Qt 5.14.2 MinGW 64-bit - qt.qt5.5142.win64_mingw73_kit + 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:/work/code/BJJZ/svntest/softwareDirectory/build-AutoVerScheme-Desktop_Qt_5_14_2_MinGW_64_bit-Debug + D:/dev/software/softwareDirectory/build-AutoVerScheme-Desktop_Qt_5_14_2_MinGW_32_bit-Debug true @@ -362,7 +379,7 @@ 2 - D:/work/code/BJJZ/svntest/softwareDirectory/build-AutoVerScheme-Desktop_Qt_5_14_2_MinGW_64_bit-Release + D:/dev/software/softwareDirectory/build-AutoVerScheme-Desktop_Qt_5_14_2_MinGW_32_bit-Release true @@ -410,7 +427,7 @@ 0 - D:/work/code/BJJZ/svntest/softwareDirectory/build-AutoVerScheme-Desktop_Qt_5_14_2_MinGW_64_bit-Profile + D:/dev/software/softwareDirectory/build-AutoVerScheme-Desktop_Qt_5_14_2_MinGW_32_bit-Profile true @@ -530,14 +547,14 @@ 2 - - ProjectExplorer.CustomExecutableRunConfiguration - + Qt4ProjectManager.Qt4RunConfiguration:D:/dev/software/softwareDirectory/AutoVerScheme/AutoVerScheme.pro + D:/dev/software/softwareDirectory/AutoVerScheme/AutoVerScheme.pro false false true + true false false true diff --git a/softwareDirectory/AutoVerScheme/AutoVerScheme.pro.user.94e4c4a b/softwareDirectory/AutoVerScheme/AutoVerScheme.pro.user.94e4c4a new file mode 100644 index 0000000..742ac25 --- /dev/null +++ b/softwareDirectory/AutoVerScheme/AutoVerScheme.pro.user.94e4c4a @@ -0,0 +1,562 @@ + + + + + + EnvironmentId + {94e4c4a1-54d4-412c-b108-da01d63f0d97} + + + 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 32-bit + Desktop Qt 5.14.2 MinGW 32-bit + qt.qt5.5142.win32_mingw73_kit + 0 + 0 + 0 + + D:/work/code/BJJZ/svntest/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:/work/code/BJJZ/svntest/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:/work/code/BJJZ/svntest/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:/work/code/BJJZ/svntest/softwareDirectory/AutoVerScheme/AutoVerScheme.pro + D:/work/code/BJJZ/svntest/softwareDirectory/AutoVerScheme/AutoVerScheme.pro + + false + + false + true + true + false + false + true + + D:/work/code/BJJZ/svntest/softwareDirectory/build-AutoVerScheme-Desktop_Qt_5_14_2_MinGW_32_bit-Debug + + 1 + + + + ProjectExplorer.Project.Target.1 + + 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:/work/code/BJJZ/svntest/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:/work/code/BJJZ/svntest/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:/work/code/BJJZ/svntest/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 + + + ProjectExplorer.CustomExecutableRunConfiguration + + + false + + false + true + false + false + true + + + + 1 + + + + ProjectExplorer.Project.TargetCount + 2 + + + ProjectExplorer.Project.Updater.FileVersion + 22 + + + Version + 22 + + diff --git a/softwareDirectory/AutoVerScheme/checkdevice.cpp b/softwareDirectory/AutoVerScheme/checkdevice.cpp index 5497af2..d540aa6 100644 --- a/softwareDirectory/AutoVerScheme/checkdevice.cpp +++ b/softwareDirectory/AutoVerScheme/checkdevice.cpp @@ -14,6 +14,7 @@ ui->tableWidget_4->setColumnWidth(0, 80); for(int i=1;i<5;i++) ui->tableWidget_4->horizontalHeader()->setSectionResizeMode(i,QHeaderView::Stretch); + getCheckDevice(); getStandardDevice(); } @@ -22,6 +23,23 @@ delete ui; } +void CheckDevice::getCheckDevice() +{ + int rowCount=0; + int row=0; + QList data = BaseCommonApi::getTestedDevice(); + for (const TestedDevice& bizDevice : data) { + rowCount = ui->tableWidget_3->rowCount(); + ui->tableWidget_3->insertRow(rowCount); + QCheckBox *checkBox = new QCheckBox; + ui->tableWidget_3->setCellWidget(row, 0, checkBox); + ui->tableWidget_4->setItem(row, 1, new QTableWidgetItem(bizDevice.equipment_name)); + ui->tableWidget_4->setItem(row, 2, new QTableWidgetItem(bizDevice.model)); + ui->tableWidget_4->setItem(row, 3, new QTableWidgetItem(bizDevice.help_instruction)); + row++; + } +} + void CheckDevice::getStandardDevice() { int rowCount=0; diff --git a/softwareDirectory/AutoVerScheme/checkdevice.h b/softwareDirectory/AutoVerScheme/checkdevice.h index fc42d90..8102d24 100644 --- a/softwareDirectory/AutoVerScheme/checkdevice.h +++ b/softwareDirectory/AutoVerScheme/checkdevice.h @@ -16,6 +16,7 @@ ~CheckDevice(); private: + void getCheckDevice(); void getStandardDevice(); private: diff --git a/softwareDirectory/AutoVerScheme/depar_task.cpp b/softwareDirectory/AutoVerScheme/depar_task.cpp index 5b5c3ef..ea7c6a2 100644 --- a/softwareDirectory/AutoVerScheme/depar_task.cpp +++ b/softwareDirectory/AutoVerScheme/depar_task.cpp @@ -97,7 +97,7 @@ ui->tableWidget->setItem(row, 5, new QTableWidgetItem(dept.manufacturer)); //设置数据 ui->tableWidget->setItem(row, 6, new QTableWidgetItem(dept.customer_name)); //设置数据 ui->tableWidget->setItem(row, 7, new QTableWidgetItem(dept.FULL_NAME)); //设置数据 - ui->tableWidget->setItem(row, 8, new QTableWidgetItem(dept.require_over_time)); //设置数据 + ui->tableWidget->setItem(row, 8, new QTableWidgetItem(dept.require_over_time.toString())); //设置数据 if(dept.is_urgent=="1") State="是"; else diff --git a/softwareDirectory/AutoVerScheme/formcheckpoint.cpp b/softwareDirectory/AutoVerScheme/formcheckpoint.cpp new file mode 100644 index 0000000..5ff2d74 --- /dev/null +++ b/softwareDirectory/AutoVerScheme/formcheckpoint.cpp @@ -0,0 +1,14 @@ +#include "formcheckpoint.h" +#include "ui_formcheckpoint.h" + +FormCheckPoint::FormCheckPoint(QWidget *parent) : + QWidget(parent), + ui(new Ui::FormCheckPoint) +{ + ui->setupUi(this); +} + +FormCheckPoint::~FormCheckPoint() +{ + delete ui; +} diff --git a/softwareDirectory/AutoVerScheme/formcheckpoint.h b/softwareDirectory/AutoVerScheme/formcheckpoint.h new file mode 100644 index 0000000..5f8ccf0 --- /dev/null +++ b/softwareDirectory/AutoVerScheme/formcheckpoint.h @@ -0,0 +1,22 @@ +#ifndef FORMCHECKPOINT_H +#define FORMCHECKPOINT_H + +#include + +namespace Ui { +class FormCheckPoint; +} + +class FormCheckPoint : public QWidget +{ + Q_OBJECT + +public: + explicit FormCheckPoint(QWidget *parent = nullptr); + ~FormCheckPoint(); + +private: + Ui::FormCheckPoint *ui; +}; + +#endif // FORMCHECKPOINT_H diff --git a/softwareDirectory/AutoVerScheme/AutoVerScheme.pro b/softwareDirectory/AutoVerScheme/AutoVerScheme.pro index b7a7f10..4b3cb2b 100644 --- a/softwareDirectory/AutoVerScheme/AutoVerScheme.pro +++ b/softwareDirectory/AutoVerScheme/AutoVerScheme.pro @@ -31,6 +31,8 @@ depar_task.cpp \ depar_task_server.cpp \ dialogcheckresult.cpp \ + formcheckpoint.cpp \ + formverypoint.cpp \ indexwindow.cpp \ infomanageview.cpp \ inspectdataitem.cpp \ @@ -66,6 +68,8 @@ depar_task.h \ depar_task_server.h \ dialogcheckresult.h \ + formcheckpoint.h \ + formverypoint.h \ indexwindow.h \ infomanageview.h \ inspectdataitem.h \ @@ -94,6 +98,8 @@ datasyncview.ui \ depar_task.ui \ dialogcheckresult.ui \ + formcheckpoint.ui \ + formverypoint.ui \ indexwindow.ui \ infomanageview.ui \ inspectdataitem.ui \ diff --git a/softwareDirectory/AutoVerScheme/AutoVerScheme.pro.user b/softwareDirectory/AutoVerScheme/AutoVerScheme.pro.user index b379c65..c5290fc 100644 --- a/softwareDirectory/AutoVerScheme/AutoVerScheme.pro.user +++ b/softwareDirectory/AutoVerScheme/AutoVerScheme.pro.user @@ -1,10 +1,10 @@ - + EnvironmentId - {94e4c4a1-54d4-412c-b108-da01d63f0d97} + {2746248a-b112-4e0f-9ae0-9e61f2a42309} ProjectExplorer.Project.ActiveTarget @@ -55,23 +55,40 @@ ProjectExplorer.Project.PluginSettings + + true + true + true + true + + 0 + true -fno-delayed-template-parsing true + + true + Builtin.TidyAndClazy + 4 + + + + true + ProjectExplorer.Project.Target.0 - Desktop Qt 5.14.2 MinGW 32-bit - Desktop Qt 5.14.2 MinGW 32-bit - qt.qt5.5142.win32_mingw73_kit + 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:/work/code/BJJZ/svntest/softwareDirectory/build-AutoVerScheme-Desktop_Qt_5_14_2_MinGW_32_bit-Debug + D:/dev/software/softwareDirectory/build-AutoVerScheme-Desktop_Qt_5_14_2_MinGW_64_bit-Debug true @@ -119,7 +136,7 @@ 2 - D:/work/code/BJJZ/svntest/softwareDirectory/build-AutoVerScheme-Desktop_Qt_5_14_2_MinGW_32_bit-Release + D:/dev/software/softwareDirectory/build-AutoVerScheme-Desktop_Qt_5_14_2_MinGW_64_bit-Release true @@ -167,7 +184,7 @@ 0 - D:/work/code/BJJZ/svntest/softwareDirectory/build-AutoVerScheme-Desktop_Qt_5_14_2_MinGW_32_bit-Profile + D:/dev/software/softwareDirectory/build-AutoVerScheme-Desktop_Qt_5_14_2_MinGW_64_bit-Profile true @@ -287,8 +304,8 @@ 2 - Qt4ProjectManager.Qt4RunConfiguration:D:/work/code/BJJZ/svntest/softwareDirectory/AutoVerScheme/AutoVerScheme.pro - D:/work/code/BJJZ/svntest/softwareDirectory/AutoVerScheme/AutoVerScheme.pro + Qt4ProjectManager.Qt4RunConfiguration:D:/dev/software/softwareDirectory/AutoVerScheme/AutoVerScheme.pro + D:/dev/software/softwareDirectory/AutoVerScheme/AutoVerScheme.pro false @@ -299,7 +316,7 @@ false true - D:/work/code/BJJZ/svntest/softwareDirectory/build-AutoVerScheme-Desktop_Qt_5_14_2_MinGW_32_bit-Debug + D:/dev/software/softwareDirectory/build-AutoVerScheme-Desktop_Qt_5_14_2_MinGW_64_bit-Debug 1 @@ -307,14 +324,14 @@ ProjectExplorer.Project.Target.1 - Desktop Qt 5.14.2 MinGW 64-bit - Desktop Qt 5.14.2 MinGW 64-bit - qt.qt5.5142.win64_mingw73_kit + 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:/work/code/BJJZ/svntest/softwareDirectory/build-AutoVerScheme-Desktop_Qt_5_14_2_MinGW_64_bit-Debug + D:/dev/software/softwareDirectory/build-AutoVerScheme-Desktop_Qt_5_14_2_MinGW_32_bit-Debug true @@ -362,7 +379,7 @@ 2 - D:/work/code/BJJZ/svntest/softwareDirectory/build-AutoVerScheme-Desktop_Qt_5_14_2_MinGW_64_bit-Release + D:/dev/software/softwareDirectory/build-AutoVerScheme-Desktop_Qt_5_14_2_MinGW_32_bit-Release true @@ -410,7 +427,7 @@ 0 - D:/work/code/BJJZ/svntest/softwareDirectory/build-AutoVerScheme-Desktop_Qt_5_14_2_MinGW_64_bit-Profile + D:/dev/software/softwareDirectory/build-AutoVerScheme-Desktop_Qt_5_14_2_MinGW_32_bit-Profile true @@ -530,14 +547,14 @@ 2 - - ProjectExplorer.CustomExecutableRunConfiguration - + Qt4ProjectManager.Qt4RunConfiguration:D:/dev/software/softwareDirectory/AutoVerScheme/AutoVerScheme.pro + D:/dev/software/softwareDirectory/AutoVerScheme/AutoVerScheme.pro false false true + true false false true diff --git a/softwareDirectory/AutoVerScheme/AutoVerScheme.pro.user.94e4c4a b/softwareDirectory/AutoVerScheme/AutoVerScheme.pro.user.94e4c4a new file mode 100644 index 0000000..742ac25 --- /dev/null +++ b/softwareDirectory/AutoVerScheme/AutoVerScheme.pro.user.94e4c4a @@ -0,0 +1,562 @@ + + + + + + EnvironmentId + {94e4c4a1-54d4-412c-b108-da01d63f0d97} + + + 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 32-bit + Desktop Qt 5.14.2 MinGW 32-bit + qt.qt5.5142.win32_mingw73_kit + 0 + 0 + 0 + + D:/work/code/BJJZ/svntest/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:/work/code/BJJZ/svntest/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:/work/code/BJJZ/svntest/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:/work/code/BJJZ/svntest/softwareDirectory/AutoVerScheme/AutoVerScheme.pro + D:/work/code/BJJZ/svntest/softwareDirectory/AutoVerScheme/AutoVerScheme.pro + + false + + false + true + true + false + false + true + + D:/work/code/BJJZ/svntest/softwareDirectory/build-AutoVerScheme-Desktop_Qt_5_14_2_MinGW_32_bit-Debug + + 1 + + + + ProjectExplorer.Project.Target.1 + + 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:/work/code/BJJZ/svntest/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:/work/code/BJJZ/svntest/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:/work/code/BJJZ/svntest/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 + + + ProjectExplorer.CustomExecutableRunConfiguration + + + false + + false + true + false + false + true + + + + 1 + + + + ProjectExplorer.Project.TargetCount + 2 + + + ProjectExplorer.Project.Updater.FileVersion + 22 + + + Version + 22 + + diff --git a/softwareDirectory/AutoVerScheme/checkdevice.cpp b/softwareDirectory/AutoVerScheme/checkdevice.cpp index 5497af2..d540aa6 100644 --- a/softwareDirectory/AutoVerScheme/checkdevice.cpp +++ b/softwareDirectory/AutoVerScheme/checkdevice.cpp @@ -14,6 +14,7 @@ ui->tableWidget_4->setColumnWidth(0, 80); for(int i=1;i<5;i++) ui->tableWidget_4->horizontalHeader()->setSectionResizeMode(i,QHeaderView::Stretch); + getCheckDevice(); getStandardDevice(); } @@ -22,6 +23,23 @@ delete ui; } +void CheckDevice::getCheckDevice() +{ + int rowCount=0; + int row=0; + QList data = BaseCommonApi::getTestedDevice(); + for (const TestedDevice& bizDevice : data) { + rowCount = ui->tableWidget_3->rowCount(); + ui->tableWidget_3->insertRow(rowCount); + QCheckBox *checkBox = new QCheckBox; + ui->tableWidget_3->setCellWidget(row, 0, checkBox); + ui->tableWidget_4->setItem(row, 1, new QTableWidgetItem(bizDevice.equipment_name)); + ui->tableWidget_4->setItem(row, 2, new QTableWidgetItem(bizDevice.model)); + ui->tableWidget_4->setItem(row, 3, new QTableWidgetItem(bizDevice.help_instruction)); + row++; + } +} + void CheckDevice::getStandardDevice() { int rowCount=0; diff --git a/softwareDirectory/AutoVerScheme/checkdevice.h b/softwareDirectory/AutoVerScheme/checkdevice.h index fc42d90..8102d24 100644 --- a/softwareDirectory/AutoVerScheme/checkdevice.h +++ b/softwareDirectory/AutoVerScheme/checkdevice.h @@ -16,6 +16,7 @@ ~CheckDevice(); private: + void getCheckDevice(); void getStandardDevice(); private: diff --git a/softwareDirectory/AutoVerScheme/depar_task.cpp b/softwareDirectory/AutoVerScheme/depar_task.cpp index 5b5c3ef..ea7c6a2 100644 --- a/softwareDirectory/AutoVerScheme/depar_task.cpp +++ b/softwareDirectory/AutoVerScheme/depar_task.cpp @@ -97,7 +97,7 @@ ui->tableWidget->setItem(row, 5, new QTableWidgetItem(dept.manufacturer)); //设置数据 ui->tableWidget->setItem(row, 6, new QTableWidgetItem(dept.customer_name)); //设置数据 ui->tableWidget->setItem(row, 7, new QTableWidgetItem(dept.FULL_NAME)); //设置数据 - ui->tableWidget->setItem(row, 8, new QTableWidgetItem(dept.require_over_time)); //设置数据 + ui->tableWidget->setItem(row, 8, new QTableWidgetItem(dept.require_over_time.toString())); //设置数据 if(dept.is_urgent=="1") State="是"; else diff --git a/softwareDirectory/AutoVerScheme/formcheckpoint.cpp b/softwareDirectory/AutoVerScheme/formcheckpoint.cpp new file mode 100644 index 0000000..5ff2d74 --- /dev/null +++ b/softwareDirectory/AutoVerScheme/formcheckpoint.cpp @@ -0,0 +1,14 @@ +#include "formcheckpoint.h" +#include "ui_formcheckpoint.h" + +FormCheckPoint::FormCheckPoint(QWidget *parent) : + QWidget(parent), + ui(new Ui::FormCheckPoint) +{ + ui->setupUi(this); +} + +FormCheckPoint::~FormCheckPoint() +{ + delete ui; +} diff --git a/softwareDirectory/AutoVerScheme/formcheckpoint.h b/softwareDirectory/AutoVerScheme/formcheckpoint.h new file mode 100644 index 0000000..5f8ccf0 --- /dev/null +++ b/softwareDirectory/AutoVerScheme/formcheckpoint.h @@ -0,0 +1,22 @@ +#ifndef FORMCHECKPOINT_H +#define FORMCHECKPOINT_H + +#include + +namespace Ui { +class FormCheckPoint; +} + +class FormCheckPoint : public QWidget +{ + Q_OBJECT + +public: + explicit FormCheckPoint(QWidget *parent = nullptr); + ~FormCheckPoint(); + +private: + Ui::FormCheckPoint *ui; +}; + +#endif // FORMCHECKPOINT_H diff --git a/softwareDirectory/AutoVerScheme/formcheckpoint.ui b/softwareDirectory/AutoVerScheme/formcheckpoint.ui new file mode 100644 index 0000000..3a6eb47 --- /dev/null +++ b/softwareDirectory/AutoVerScheme/formcheckpoint.ui @@ -0,0 +1,168 @@ + + + FormCheckPoint + + + + 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); + + + + + + + 12 + 75 + true + + + + 检定项目及检定点 + + + + + + + + + + + + + + + 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 b7a7f10..4b3cb2b 100644 --- a/softwareDirectory/AutoVerScheme/AutoVerScheme.pro +++ b/softwareDirectory/AutoVerScheme/AutoVerScheme.pro @@ -31,6 +31,8 @@ depar_task.cpp \ depar_task_server.cpp \ dialogcheckresult.cpp \ + formcheckpoint.cpp \ + formverypoint.cpp \ indexwindow.cpp \ infomanageview.cpp \ inspectdataitem.cpp \ @@ -66,6 +68,8 @@ depar_task.h \ depar_task_server.h \ dialogcheckresult.h \ + formcheckpoint.h \ + formverypoint.h \ indexwindow.h \ infomanageview.h \ inspectdataitem.h \ @@ -94,6 +98,8 @@ datasyncview.ui \ depar_task.ui \ dialogcheckresult.ui \ + formcheckpoint.ui \ + formverypoint.ui \ indexwindow.ui \ infomanageview.ui \ inspectdataitem.ui \ diff --git a/softwareDirectory/AutoVerScheme/AutoVerScheme.pro.user b/softwareDirectory/AutoVerScheme/AutoVerScheme.pro.user index b379c65..c5290fc 100644 --- a/softwareDirectory/AutoVerScheme/AutoVerScheme.pro.user +++ b/softwareDirectory/AutoVerScheme/AutoVerScheme.pro.user @@ -1,10 +1,10 @@ - + EnvironmentId - {94e4c4a1-54d4-412c-b108-da01d63f0d97} + {2746248a-b112-4e0f-9ae0-9e61f2a42309} ProjectExplorer.Project.ActiveTarget @@ -55,23 +55,40 @@ ProjectExplorer.Project.PluginSettings + + true + true + true + true + + 0 + true -fno-delayed-template-parsing true + + true + Builtin.TidyAndClazy + 4 + + + + true + ProjectExplorer.Project.Target.0 - Desktop Qt 5.14.2 MinGW 32-bit - Desktop Qt 5.14.2 MinGW 32-bit - qt.qt5.5142.win32_mingw73_kit + 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:/work/code/BJJZ/svntest/softwareDirectory/build-AutoVerScheme-Desktop_Qt_5_14_2_MinGW_32_bit-Debug + D:/dev/software/softwareDirectory/build-AutoVerScheme-Desktop_Qt_5_14_2_MinGW_64_bit-Debug true @@ -119,7 +136,7 @@ 2 - D:/work/code/BJJZ/svntest/softwareDirectory/build-AutoVerScheme-Desktop_Qt_5_14_2_MinGW_32_bit-Release + D:/dev/software/softwareDirectory/build-AutoVerScheme-Desktop_Qt_5_14_2_MinGW_64_bit-Release true @@ -167,7 +184,7 @@ 0 - D:/work/code/BJJZ/svntest/softwareDirectory/build-AutoVerScheme-Desktop_Qt_5_14_2_MinGW_32_bit-Profile + D:/dev/software/softwareDirectory/build-AutoVerScheme-Desktop_Qt_5_14_2_MinGW_64_bit-Profile true @@ -287,8 +304,8 @@ 2 - Qt4ProjectManager.Qt4RunConfiguration:D:/work/code/BJJZ/svntest/softwareDirectory/AutoVerScheme/AutoVerScheme.pro - D:/work/code/BJJZ/svntest/softwareDirectory/AutoVerScheme/AutoVerScheme.pro + Qt4ProjectManager.Qt4RunConfiguration:D:/dev/software/softwareDirectory/AutoVerScheme/AutoVerScheme.pro + D:/dev/software/softwareDirectory/AutoVerScheme/AutoVerScheme.pro false @@ -299,7 +316,7 @@ false true - D:/work/code/BJJZ/svntest/softwareDirectory/build-AutoVerScheme-Desktop_Qt_5_14_2_MinGW_32_bit-Debug + D:/dev/software/softwareDirectory/build-AutoVerScheme-Desktop_Qt_5_14_2_MinGW_64_bit-Debug 1 @@ -307,14 +324,14 @@ ProjectExplorer.Project.Target.1 - Desktop Qt 5.14.2 MinGW 64-bit - Desktop Qt 5.14.2 MinGW 64-bit - qt.qt5.5142.win64_mingw73_kit + 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:/work/code/BJJZ/svntest/softwareDirectory/build-AutoVerScheme-Desktop_Qt_5_14_2_MinGW_64_bit-Debug + D:/dev/software/softwareDirectory/build-AutoVerScheme-Desktop_Qt_5_14_2_MinGW_32_bit-Debug true @@ -362,7 +379,7 @@ 2 - D:/work/code/BJJZ/svntest/softwareDirectory/build-AutoVerScheme-Desktop_Qt_5_14_2_MinGW_64_bit-Release + D:/dev/software/softwareDirectory/build-AutoVerScheme-Desktop_Qt_5_14_2_MinGW_32_bit-Release true @@ -410,7 +427,7 @@ 0 - D:/work/code/BJJZ/svntest/softwareDirectory/build-AutoVerScheme-Desktop_Qt_5_14_2_MinGW_64_bit-Profile + D:/dev/software/softwareDirectory/build-AutoVerScheme-Desktop_Qt_5_14_2_MinGW_32_bit-Profile true @@ -530,14 +547,14 @@ 2 - - ProjectExplorer.CustomExecutableRunConfiguration - + Qt4ProjectManager.Qt4RunConfiguration:D:/dev/software/softwareDirectory/AutoVerScheme/AutoVerScheme.pro + D:/dev/software/softwareDirectory/AutoVerScheme/AutoVerScheme.pro false false true + true false false true diff --git a/softwareDirectory/AutoVerScheme/AutoVerScheme.pro.user.94e4c4a b/softwareDirectory/AutoVerScheme/AutoVerScheme.pro.user.94e4c4a new file mode 100644 index 0000000..742ac25 --- /dev/null +++ b/softwareDirectory/AutoVerScheme/AutoVerScheme.pro.user.94e4c4a @@ -0,0 +1,562 @@ + + + + + + EnvironmentId + {94e4c4a1-54d4-412c-b108-da01d63f0d97} + + + 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 32-bit + Desktop Qt 5.14.2 MinGW 32-bit + qt.qt5.5142.win32_mingw73_kit + 0 + 0 + 0 + + D:/work/code/BJJZ/svntest/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:/work/code/BJJZ/svntest/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:/work/code/BJJZ/svntest/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:/work/code/BJJZ/svntest/softwareDirectory/AutoVerScheme/AutoVerScheme.pro + D:/work/code/BJJZ/svntest/softwareDirectory/AutoVerScheme/AutoVerScheme.pro + + false + + false + true + true + false + false + true + + D:/work/code/BJJZ/svntest/softwareDirectory/build-AutoVerScheme-Desktop_Qt_5_14_2_MinGW_32_bit-Debug + + 1 + + + + ProjectExplorer.Project.Target.1 + + 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:/work/code/BJJZ/svntest/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:/work/code/BJJZ/svntest/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:/work/code/BJJZ/svntest/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 + + + ProjectExplorer.CustomExecutableRunConfiguration + + + false + + false + true + false + false + true + + + + 1 + + + + ProjectExplorer.Project.TargetCount + 2 + + + ProjectExplorer.Project.Updater.FileVersion + 22 + + + Version + 22 + + diff --git a/softwareDirectory/AutoVerScheme/checkdevice.cpp b/softwareDirectory/AutoVerScheme/checkdevice.cpp index 5497af2..d540aa6 100644 --- a/softwareDirectory/AutoVerScheme/checkdevice.cpp +++ b/softwareDirectory/AutoVerScheme/checkdevice.cpp @@ -14,6 +14,7 @@ ui->tableWidget_4->setColumnWidth(0, 80); for(int i=1;i<5;i++) ui->tableWidget_4->horizontalHeader()->setSectionResizeMode(i,QHeaderView::Stretch); + getCheckDevice(); getStandardDevice(); } @@ -22,6 +23,23 @@ delete ui; } +void CheckDevice::getCheckDevice() +{ + int rowCount=0; + int row=0; + QList data = BaseCommonApi::getTestedDevice(); + for (const TestedDevice& bizDevice : data) { + rowCount = ui->tableWidget_3->rowCount(); + ui->tableWidget_3->insertRow(rowCount); + QCheckBox *checkBox = new QCheckBox; + ui->tableWidget_3->setCellWidget(row, 0, checkBox); + ui->tableWidget_4->setItem(row, 1, new QTableWidgetItem(bizDevice.equipment_name)); + ui->tableWidget_4->setItem(row, 2, new QTableWidgetItem(bizDevice.model)); + ui->tableWidget_4->setItem(row, 3, new QTableWidgetItem(bizDevice.help_instruction)); + row++; + } +} + void CheckDevice::getStandardDevice() { int rowCount=0; diff --git a/softwareDirectory/AutoVerScheme/checkdevice.h b/softwareDirectory/AutoVerScheme/checkdevice.h index fc42d90..8102d24 100644 --- a/softwareDirectory/AutoVerScheme/checkdevice.h +++ b/softwareDirectory/AutoVerScheme/checkdevice.h @@ -16,6 +16,7 @@ ~CheckDevice(); private: + void getCheckDevice(); void getStandardDevice(); private: diff --git a/softwareDirectory/AutoVerScheme/depar_task.cpp b/softwareDirectory/AutoVerScheme/depar_task.cpp index 5b5c3ef..ea7c6a2 100644 --- a/softwareDirectory/AutoVerScheme/depar_task.cpp +++ b/softwareDirectory/AutoVerScheme/depar_task.cpp @@ -97,7 +97,7 @@ ui->tableWidget->setItem(row, 5, new QTableWidgetItem(dept.manufacturer)); //设置数据 ui->tableWidget->setItem(row, 6, new QTableWidgetItem(dept.customer_name)); //设置数据 ui->tableWidget->setItem(row, 7, new QTableWidgetItem(dept.FULL_NAME)); //设置数据 - ui->tableWidget->setItem(row, 8, new QTableWidgetItem(dept.require_over_time)); //设置数据 + ui->tableWidget->setItem(row, 8, new QTableWidgetItem(dept.require_over_time.toString())); //设置数据 if(dept.is_urgent=="1") State="是"; else diff --git a/softwareDirectory/AutoVerScheme/formcheckpoint.cpp b/softwareDirectory/AutoVerScheme/formcheckpoint.cpp new file mode 100644 index 0000000..5ff2d74 --- /dev/null +++ b/softwareDirectory/AutoVerScheme/formcheckpoint.cpp @@ -0,0 +1,14 @@ +#include "formcheckpoint.h" +#include "ui_formcheckpoint.h" + +FormCheckPoint::FormCheckPoint(QWidget *parent) : + QWidget(parent), + ui(new Ui::FormCheckPoint) +{ + ui->setupUi(this); +} + +FormCheckPoint::~FormCheckPoint() +{ + delete ui; +} diff --git a/softwareDirectory/AutoVerScheme/formcheckpoint.h b/softwareDirectory/AutoVerScheme/formcheckpoint.h new file mode 100644 index 0000000..5f8ccf0 --- /dev/null +++ b/softwareDirectory/AutoVerScheme/formcheckpoint.h @@ -0,0 +1,22 @@ +#ifndef FORMCHECKPOINT_H +#define FORMCHECKPOINT_H + +#include + +namespace Ui { +class FormCheckPoint; +} + +class FormCheckPoint : public QWidget +{ + Q_OBJECT + +public: + explicit FormCheckPoint(QWidget *parent = nullptr); + ~FormCheckPoint(); + +private: + Ui::FormCheckPoint *ui; +}; + +#endif // FORMCHECKPOINT_H diff --git a/softwareDirectory/AutoVerScheme/formcheckpoint.ui b/softwareDirectory/AutoVerScheme/formcheckpoint.ui new file mode 100644 index 0000000..3a6eb47 --- /dev/null +++ b/softwareDirectory/AutoVerScheme/formcheckpoint.ui @@ -0,0 +1,168 @@ + + + FormCheckPoint + + + + 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); + + + + + + + 12 + 75 + true + + + + 检定项目及检定点 + + + + + + + + + + + + + + + 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/formverypoint.cpp b/softwareDirectory/AutoVerScheme/formverypoint.cpp new file mode 100644 index 0000000..d1cec57 --- /dev/null +++ b/softwareDirectory/AutoVerScheme/formverypoint.cpp @@ -0,0 +1,14 @@ +#include "formverypoint.h" +#include "ui_formverypoint.h" + +FormVeryPoint::FormVeryPoint(QWidget *parent) : + QWidget(parent), + ui(new Ui::FormVeryPoint) +{ + ui->setupUi(this); +} + +FormVeryPoint::~FormVeryPoint() +{ + delete ui; +} diff --git a/softwareDirectory/AutoVerScheme/AutoVerScheme.pro b/softwareDirectory/AutoVerScheme/AutoVerScheme.pro index b7a7f10..4b3cb2b 100644 --- a/softwareDirectory/AutoVerScheme/AutoVerScheme.pro +++ b/softwareDirectory/AutoVerScheme/AutoVerScheme.pro @@ -31,6 +31,8 @@ depar_task.cpp \ depar_task_server.cpp \ dialogcheckresult.cpp \ + formcheckpoint.cpp \ + formverypoint.cpp \ indexwindow.cpp \ infomanageview.cpp \ inspectdataitem.cpp \ @@ -66,6 +68,8 @@ depar_task.h \ depar_task_server.h \ dialogcheckresult.h \ + formcheckpoint.h \ + formverypoint.h \ indexwindow.h \ infomanageview.h \ inspectdataitem.h \ @@ -94,6 +98,8 @@ datasyncview.ui \ depar_task.ui \ dialogcheckresult.ui \ + formcheckpoint.ui \ + formverypoint.ui \ indexwindow.ui \ infomanageview.ui \ inspectdataitem.ui \ diff --git a/softwareDirectory/AutoVerScheme/AutoVerScheme.pro.user b/softwareDirectory/AutoVerScheme/AutoVerScheme.pro.user index b379c65..c5290fc 100644 --- a/softwareDirectory/AutoVerScheme/AutoVerScheme.pro.user +++ b/softwareDirectory/AutoVerScheme/AutoVerScheme.pro.user @@ -1,10 +1,10 @@ - + EnvironmentId - {94e4c4a1-54d4-412c-b108-da01d63f0d97} + {2746248a-b112-4e0f-9ae0-9e61f2a42309} ProjectExplorer.Project.ActiveTarget @@ -55,23 +55,40 @@ ProjectExplorer.Project.PluginSettings + + true + true + true + true + + 0 + true -fno-delayed-template-parsing true + + true + Builtin.TidyAndClazy + 4 + + + + true + ProjectExplorer.Project.Target.0 - Desktop Qt 5.14.2 MinGW 32-bit - Desktop Qt 5.14.2 MinGW 32-bit - qt.qt5.5142.win32_mingw73_kit + 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:/work/code/BJJZ/svntest/softwareDirectory/build-AutoVerScheme-Desktop_Qt_5_14_2_MinGW_32_bit-Debug + D:/dev/software/softwareDirectory/build-AutoVerScheme-Desktop_Qt_5_14_2_MinGW_64_bit-Debug true @@ -119,7 +136,7 @@ 2 - D:/work/code/BJJZ/svntest/softwareDirectory/build-AutoVerScheme-Desktop_Qt_5_14_2_MinGW_32_bit-Release + D:/dev/software/softwareDirectory/build-AutoVerScheme-Desktop_Qt_5_14_2_MinGW_64_bit-Release true @@ -167,7 +184,7 @@ 0 - D:/work/code/BJJZ/svntest/softwareDirectory/build-AutoVerScheme-Desktop_Qt_5_14_2_MinGW_32_bit-Profile + D:/dev/software/softwareDirectory/build-AutoVerScheme-Desktop_Qt_5_14_2_MinGW_64_bit-Profile true @@ -287,8 +304,8 @@ 2 - Qt4ProjectManager.Qt4RunConfiguration:D:/work/code/BJJZ/svntest/softwareDirectory/AutoVerScheme/AutoVerScheme.pro - D:/work/code/BJJZ/svntest/softwareDirectory/AutoVerScheme/AutoVerScheme.pro + Qt4ProjectManager.Qt4RunConfiguration:D:/dev/software/softwareDirectory/AutoVerScheme/AutoVerScheme.pro + D:/dev/software/softwareDirectory/AutoVerScheme/AutoVerScheme.pro false @@ -299,7 +316,7 @@ false true - D:/work/code/BJJZ/svntest/softwareDirectory/build-AutoVerScheme-Desktop_Qt_5_14_2_MinGW_32_bit-Debug + D:/dev/software/softwareDirectory/build-AutoVerScheme-Desktop_Qt_5_14_2_MinGW_64_bit-Debug 1 @@ -307,14 +324,14 @@ ProjectExplorer.Project.Target.1 - Desktop Qt 5.14.2 MinGW 64-bit - Desktop Qt 5.14.2 MinGW 64-bit - qt.qt5.5142.win64_mingw73_kit + 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:/work/code/BJJZ/svntest/softwareDirectory/build-AutoVerScheme-Desktop_Qt_5_14_2_MinGW_64_bit-Debug + D:/dev/software/softwareDirectory/build-AutoVerScheme-Desktop_Qt_5_14_2_MinGW_32_bit-Debug true @@ -362,7 +379,7 @@ 2 - D:/work/code/BJJZ/svntest/softwareDirectory/build-AutoVerScheme-Desktop_Qt_5_14_2_MinGW_64_bit-Release + D:/dev/software/softwareDirectory/build-AutoVerScheme-Desktop_Qt_5_14_2_MinGW_32_bit-Release true @@ -410,7 +427,7 @@ 0 - D:/work/code/BJJZ/svntest/softwareDirectory/build-AutoVerScheme-Desktop_Qt_5_14_2_MinGW_64_bit-Profile + D:/dev/software/softwareDirectory/build-AutoVerScheme-Desktop_Qt_5_14_2_MinGW_32_bit-Profile true @@ -530,14 +547,14 @@ 2 - - ProjectExplorer.CustomExecutableRunConfiguration - + Qt4ProjectManager.Qt4RunConfiguration:D:/dev/software/softwareDirectory/AutoVerScheme/AutoVerScheme.pro + D:/dev/software/softwareDirectory/AutoVerScheme/AutoVerScheme.pro false false true + true false false true diff --git a/softwareDirectory/AutoVerScheme/AutoVerScheme.pro.user.94e4c4a b/softwareDirectory/AutoVerScheme/AutoVerScheme.pro.user.94e4c4a new file mode 100644 index 0000000..742ac25 --- /dev/null +++ b/softwareDirectory/AutoVerScheme/AutoVerScheme.pro.user.94e4c4a @@ -0,0 +1,562 @@ + + + + + + EnvironmentId + {94e4c4a1-54d4-412c-b108-da01d63f0d97} + + + 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 32-bit + Desktop Qt 5.14.2 MinGW 32-bit + qt.qt5.5142.win32_mingw73_kit + 0 + 0 + 0 + + D:/work/code/BJJZ/svntest/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:/work/code/BJJZ/svntest/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:/work/code/BJJZ/svntest/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:/work/code/BJJZ/svntest/softwareDirectory/AutoVerScheme/AutoVerScheme.pro + D:/work/code/BJJZ/svntest/softwareDirectory/AutoVerScheme/AutoVerScheme.pro + + false + + false + true + true + false + false + true + + D:/work/code/BJJZ/svntest/softwareDirectory/build-AutoVerScheme-Desktop_Qt_5_14_2_MinGW_32_bit-Debug + + 1 + + + + ProjectExplorer.Project.Target.1 + + 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:/work/code/BJJZ/svntest/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:/work/code/BJJZ/svntest/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:/work/code/BJJZ/svntest/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 + + + ProjectExplorer.CustomExecutableRunConfiguration + + + false + + false + true + false + false + true + + + + 1 + + + + ProjectExplorer.Project.TargetCount + 2 + + + ProjectExplorer.Project.Updater.FileVersion + 22 + + + Version + 22 + + diff --git a/softwareDirectory/AutoVerScheme/checkdevice.cpp b/softwareDirectory/AutoVerScheme/checkdevice.cpp index 5497af2..d540aa6 100644 --- a/softwareDirectory/AutoVerScheme/checkdevice.cpp +++ b/softwareDirectory/AutoVerScheme/checkdevice.cpp @@ -14,6 +14,7 @@ ui->tableWidget_4->setColumnWidth(0, 80); for(int i=1;i<5;i++) ui->tableWidget_4->horizontalHeader()->setSectionResizeMode(i,QHeaderView::Stretch); + getCheckDevice(); getStandardDevice(); } @@ -22,6 +23,23 @@ delete ui; } +void CheckDevice::getCheckDevice() +{ + int rowCount=0; + int row=0; + QList data = BaseCommonApi::getTestedDevice(); + for (const TestedDevice& bizDevice : data) { + rowCount = ui->tableWidget_3->rowCount(); + ui->tableWidget_3->insertRow(rowCount); + QCheckBox *checkBox = new QCheckBox; + ui->tableWidget_3->setCellWidget(row, 0, checkBox); + ui->tableWidget_4->setItem(row, 1, new QTableWidgetItem(bizDevice.equipment_name)); + ui->tableWidget_4->setItem(row, 2, new QTableWidgetItem(bizDevice.model)); + ui->tableWidget_4->setItem(row, 3, new QTableWidgetItem(bizDevice.help_instruction)); + row++; + } +} + void CheckDevice::getStandardDevice() { int rowCount=0; diff --git a/softwareDirectory/AutoVerScheme/checkdevice.h b/softwareDirectory/AutoVerScheme/checkdevice.h index fc42d90..8102d24 100644 --- a/softwareDirectory/AutoVerScheme/checkdevice.h +++ b/softwareDirectory/AutoVerScheme/checkdevice.h @@ -16,6 +16,7 @@ ~CheckDevice(); private: + void getCheckDevice(); void getStandardDevice(); private: diff --git a/softwareDirectory/AutoVerScheme/depar_task.cpp b/softwareDirectory/AutoVerScheme/depar_task.cpp index 5b5c3ef..ea7c6a2 100644 --- a/softwareDirectory/AutoVerScheme/depar_task.cpp +++ b/softwareDirectory/AutoVerScheme/depar_task.cpp @@ -97,7 +97,7 @@ ui->tableWidget->setItem(row, 5, new QTableWidgetItem(dept.manufacturer)); //设置数据 ui->tableWidget->setItem(row, 6, new QTableWidgetItem(dept.customer_name)); //设置数据 ui->tableWidget->setItem(row, 7, new QTableWidgetItem(dept.FULL_NAME)); //设置数据 - ui->tableWidget->setItem(row, 8, new QTableWidgetItem(dept.require_over_time)); //设置数据 + ui->tableWidget->setItem(row, 8, new QTableWidgetItem(dept.require_over_time.toString())); //设置数据 if(dept.is_urgent=="1") State="是"; else diff --git a/softwareDirectory/AutoVerScheme/formcheckpoint.cpp b/softwareDirectory/AutoVerScheme/formcheckpoint.cpp new file mode 100644 index 0000000..5ff2d74 --- /dev/null +++ b/softwareDirectory/AutoVerScheme/formcheckpoint.cpp @@ -0,0 +1,14 @@ +#include "formcheckpoint.h" +#include "ui_formcheckpoint.h" + +FormCheckPoint::FormCheckPoint(QWidget *parent) : + QWidget(parent), + ui(new Ui::FormCheckPoint) +{ + ui->setupUi(this); +} + +FormCheckPoint::~FormCheckPoint() +{ + delete ui; +} diff --git a/softwareDirectory/AutoVerScheme/formcheckpoint.h b/softwareDirectory/AutoVerScheme/formcheckpoint.h new file mode 100644 index 0000000..5f8ccf0 --- /dev/null +++ b/softwareDirectory/AutoVerScheme/formcheckpoint.h @@ -0,0 +1,22 @@ +#ifndef FORMCHECKPOINT_H +#define FORMCHECKPOINT_H + +#include + +namespace Ui { +class FormCheckPoint; +} + +class FormCheckPoint : public QWidget +{ + Q_OBJECT + +public: + explicit FormCheckPoint(QWidget *parent = nullptr); + ~FormCheckPoint(); + +private: + Ui::FormCheckPoint *ui; +}; + +#endif // FORMCHECKPOINT_H diff --git a/softwareDirectory/AutoVerScheme/formcheckpoint.ui b/softwareDirectory/AutoVerScheme/formcheckpoint.ui new file mode 100644 index 0000000..3a6eb47 --- /dev/null +++ b/softwareDirectory/AutoVerScheme/formcheckpoint.ui @@ -0,0 +1,168 @@ + + + FormCheckPoint + + + + 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); + + + + + + + 12 + 75 + true + + + + 检定项目及检定点 + + + + + + + + + + + + + + + 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/formverypoint.cpp b/softwareDirectory/AutoVerScheme/formverypoint.cpp new file mode 100644 index 0000000..d1cec57 --- /dev/null +++ b/softwareDirectory/AutoVerScheme/formverypoint.cpp @@ -0,0 +1,14 @@ +#include "formverypoint.h" +#include "ui_formverypoint.h" + +FormVeryPoint::FormVeryPoint(QWidget *parent) : + QWidget(parent), + ui(new Ui::FormVeryPoint) +{ + ui->setupUi(this); +} + +FormVeryPoint::~FormVeryPoint() +{ + delete ui; +} diff --git a/softwareDirectory/AutoVerScheme/formverypoint.h b/softwareDirectory/AutoVerScheme/formverypoint.h new file mode 100644 index 0000000..bb6555c --- /dev/null +++ b/softwareDirectory/AutoVerScheme/formverypoint.h @@ -0,0 +1,22 @@ +#ifndef FORMVERYPOINT_H +#define FORMVERYPOINT_H + +#include + +namespace Ui { +class FormVeryPoint; +} + +class FormVeryPoint : public QWidget +{ + Q_OBJECT + +public: + explicit FormVeryPoint(QWidget *parent = nullptr); + ~FormVeryPoint(); + +private: + Ui::FormVeryPoint *ui; +}; + +#endif // FORMVERYPOINT_H diff --git a/softwareDirectory/AutoVerScheme/AutoVerScheme.pro b/softwareDirectory/AutoVerScheme/AutoVerScheme.pro index b7a7f10..4b3cb2b 100644 --- a/softwareDirectory/AutoVerScheme/AutoVerScheme.pro +++ b/softwareDirectory/AutoVerScheme/AutoVerScheme.pro @@ -31,6 +31,8 @@ depar_task.cpp \ depar_task_server.cpp \ dialogcheckresult.cpp \ + formcheckpoint.cpp \ + formverypoint.cpp \ indexwindow.cpp \ infomanageview.cpp \ inspectdataitem.cpp \ @@ -66,6 +68,8 @@ depar_task.h \ depar_task_server.h \ dialogcheckresult.h \ + formcheckpoint.h \ + formverypoint.h \ indexwindow.h \ infomanageview.h \ inspectdataitem.h \ @@ -94,6 +98,8 @@ datasyncview.ui \ depar_task.ui \ dialogcheckresult.ui \ + formcheckpoint.ui \ + formverypoint.ui \ indexwindow.ui \ infomanageview.ui \ inspectdataitem.ui \ diff --git a/softwareDirectory/AutoVerScheme/AutoVerScheme.pro.user b/softwareDirectory/AutoVerScheme/AutoVerScheme.pro.user index b379c65..c5290fc 100644 --- a/softwareDirectory/AutoVerScheme/AutoVerScheme.pro.user +++ b/softwareDirectory/AutoVerScheme/AutoVerScheme.pro.user @@ -1,10 +1,10 @@ - + EnvironmentId - {94e4c4a1-54d4-412c-b108-da01d63f0d97} + {2746248a-b112-4e0f-9ae0-9e61f2a42309} ProjectExplorer.Project.ActiveTarget @@ -55,23 +55,40 @@ ProjectExplorer.Project.PluginSettings + + true + true + true + true + + 0 + true -fno-delayed-template-parsing true + + true + Builtin.TidyAndClazy + 4 + + + + true + ProjectExplorer.Project.Target.0 - Desktop Qt 5.14.2 MinGW 32-bit - Desktop Qt 5.14.2 MinGW 32-bit - qt.qt5.5142.win32_mingw73_kit + 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:/work/code/BJJZ/svntest/softwareDirectory/build-AutoVerScheme-Desktop_Qt_5_14_2_MinGW_32_bit-Debug + D:/dev/software/softwareDirectory/build-AutoVerScheme-Desktop_Qt_5_14_2_MinGW_64_bit-Debug true @@ -119,7 +136,7 @@ 2 - D:/work/code/BJJZ/svntest/softwareDirectory/build-AutoVerScheme-Desktop_Qt_5_14_2_MinGW_32_bit-Release + D:/dev/software/softwareDirectory/build-AutoVerScheme-Desktop_Qt_5_14_2_MinGW_64_bit-Release true @@ -167,7 +184,7 @@ 0 - D:/work/code/BJJZ/svntest/softwareDirectory/build-AutoVerScheme-Desktop_Qt_5_14_2_MinGW_32_bit-Profile + D:/dev/software/softwareDirectory/build-AutoVerScheme-Desktop_Qt_5_14_2_MinGW_64_bit-Profile true @@ -287,8 +304,8 @@ 2 - Qt4ProjectManager.Qt4RunConfiguration:D:/work/code/BJJZ/svntest/softwareDirectory/AutoVerScheme/AutoVerScheme.pro - D:/work/code/BJJZ/svntest/softwareDirectory/AutoVerScheme/AutoVerScheme.pro + Qt4ProjectManager.Qt4RunConfiguration:D:/dev/software/softwareDirectory/AutoVerScheme/AutoVerScheme.pro + D:/dev/software/softwareDirectory/AutoVerScheme/AutoVerScheme.pro false @@ -299,7 +316,7 @@ false true - D:/work/code/BJJZ/svntest/softwareDirectory/build-AutoVerScheme-Desktop_Qt_5_14_2_MinGW_32_bit-Debug + D:/dev/software/softwareDirectory/build-AutoVerScheme-Desktop_Qt_5_14_2_MinGW_64_bit-Debug 1 @@ -307,14 +324,14 @@ ProjectExplorer.Project.Target.1 - Desktop Qt 5.14.2 MinGW 64-bit - Desktop Qt 5.14.2 MinGW 64-bit - qt.qt5.5142.win64_mingw73_kit + 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:/work/code/BJJZ/svntest/softwareDirectory/build-AutoVerScheme-Desktop_Qt_5_14_2_MinGW_64_bit-Debug + D:/dev/software/softwareDirectory/build-AutoVerScheme-Desktop_Qt_5_14_2_MinGW_32_bit-Debug true @@ -362,7 +379,7 @@ 2 - D:/work/code/BJJZ/svntest/softwareDirectory/build-AutoVerScheme-Desktop_Qt_5_14_2_MinGW_64_bit-Release + D:/dev/software/softwareDirectory/build-AutoVerScheme-Desktop_Qt_5_14_2_MinGW_32_bit-Release true @@ -410,7 +427,7 @@ 0 - D:/work/code/BJJZ/svntest/softwareDirectory/build-AutoVerScheme-Desktop_Qt_5_14_2_MinGW_64_bit-Profile + D:/dev/software/softwareDirectory/build-AutoVerScheme-Desktop_Qt_5_14_2_MinGW_32_bit-Profile true @@ -530,14 +547,14 @@ 2 - - ProjectExplorer.CustomExecutableRunConfiguration - + Qt4ProjectManager.Qt4RunConfiguration:D:/dev/software/softwareDirectory/AutoVerScheme/AutoVerScheme.pro + D:/dev/software/softwareDirectory/AutoVerScheme/AutoVerScheme.pro false false true + true false false true diff --git a/softwareDirectory/AutoVerScheme/AutoVerScheme.pro.user.94e4c4a b/softwareDirectory/AutoVerScheme/AutoVerScheme.pro.user.94e4c4a new file mode 100644 index 0000000..742ac25 --- /dev/null +++ b/softwareDirectory/AutoVerScheme/AutoVerScheme.pro.user.94e4c4a @@ -0,0 +1,562 @@ + + + + + + EnvironmentId + {94e4c4a1-54d4-412c-b108-da01d63f0d97} + + + 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 32-bit + Desktop Qt 5.14.2 MinGW 32-bit + qt.qt5.5142.win32_mingw73_kit + 0 + 0 + 0 + + D:/work/code/BJJZ/svntest/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:/work/code/BJJZ/svntest/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:/work/code/BJJZ/svntest/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:/work/code/BJJZ/svntest/softwareDirectory/AutoVerScheme/AutoVerScheme.pro + D:/work/code/BJJZ/svntest/softwareDirectory/AutoVerScheme/AutoVerScheme.pro + + false + + false + true + true + false + false + true + + D:/work/code/BJJZ/svntest/softwareDirectory/build-AutoVerScheme-Desktop_Qt_5_14_2_MinGW_32_bit-Debug + + 1 + + + + ProjectExplorer.Project.Target.1 + + 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:/work/code/BJJZ/svntest/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:/work/code/BJJZ/svntest/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:/work/code/BJJZ/svntest/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 + + + ProjectExplorer.CustomExecutableRunConfiguration + + + false + + false + true + false + false + true + + + + 1 + + + + ProjectExplorer.Project.TargetCount + 2 + + + ProjectExplorer.Project.Updater.FileVersion + 22 + + + Version + 22 + + diff --git a/softwareDirectory/AutoVerScheme/checkdevice.cpp b/softwareDirectory/AutoVerScheme/checkdevice.cpp index 5497af2..d540aa6 100644 --- a/softwareDirectory/AutoVerScheme/checkdevice.cpp +++ b/softwareDirectory/AutoVerScheme/checkdevice.cpp @@ -14,6 +14,7 @@ ui->tableWidget_4->setColumnWidth(0, 80); for(int i=1;i<5;i++) ui->tableWidget_4->horizontalHeader()->setSectionResizeMode(i,QHeaderView::Stretch); + getCheckDevice(); getStandardDevice(); } @@ -22,6 +23,23 @@ delete ui; } +void CheckDevice::getCheckDevice() +{ + int rowCount=0; + int row=0; + QList data = BaseCommonApi::getTestedDevice(); + for (const TestedDevice& bizDevice : data) { + rowCount = ui->tableWidget_3->rowCount(); + ui->tableWidget_3->insertRow(rowCount); + QCheckBox *checkBox = new QCheckBox; + ui->tableWidget_3->setCellWidget(row, 0, checkBox); + ui->tableWidget_4->setItem(row, 1, new QTableWidgetItem(bizDevice.equipment_name)); + ui->tableWidget_4->setItem(row, 2, new QTableWidgetItem(bizDevice.model)); + ui->tableWidget_4->setItem(row, 3, new QTableWidgetItem(bizDevice.help_instruction)); + row++; + } +} + void CheckDevice::getStandardDevice() { int rowCount=0; diff --git a/softwareDirectory/AutoVerScheme/checkdevice.h b/softwareDirectory/AutoVerScheme/checkdevice.h index fc42d90..8102d24 100644 --- a/softwareDirectory/AutoVerScheme/checkdevice.h +++ b/softwareDirectory/AutoVerScheme/checkdevice.h @@ -16,6 +16,7 @@ ~CheckDevice(); private: + void getCheckDevice(); void getStandardDevice(); private: diff --git a/softwareDirectory/AutoVerScheme/depar_task.cpp b/softwareDirectory/AutoVerScheme/depar_task.cpp index 5b5c3ef..ea7c6a2 100644 --- a/softwareDirectory/AutoVerScheme/depar_task.cpp +++ b/softwareDirectory/AutoVerScheme/depar_task.cpp @@ -97,7 +97,7 @@ ui->tableWidget->setItem(row, 5, new QTableWidgetItem(dept.manufacturer)); //设置数据 ui->tableWidget->setItem(row, 6, new QTableWidgetItem(dept.customer_name)); //设置数据 ui->tableWidget->setItem(row, 7, new QTableWidgetItem(dept.FULL_NAME)); //设置数据 - ui->tableWidget->setItem(row, 8, new QTableWidgetItem(dept.require_over_time)); //设置数据 + ui->tableWidget->setItem(row, 8, new QTableWidgetItem(dept.require_over_time.toString())); //设置数据 if(dept.is_urgent=="1") State="是"; else diff --git a/softwareDirectory/AutoVerScheme/formcheckpoint.cpp b/softwareDirectory/AutoVerScheme/formcheckpoint.cpp new file mode 100644 index 0000000..5ff2d74 --- /dev/null +++ b/softwareDirectory/AutoVerScheme/formcheckpoint.cpp @@ -0,0 +1,14 @@ +#include "formcheckpoint.h" +#include "ui_formcheckpoint.h" + +FormCheckPoint::FormCheckPoint(QWidget *parent) : + QWidget(parent), + ui(new Ui::FormCheckPoint) +{ + ui->setupUi(this); +} + +FormCheckPoint::~FormCheckPoint() +{ + delete ui; +} diff --git a/softwareDirectory/AutoVerScheme/formcheckpoint.h b/softwareDirectory/AutoVerScheme/formcheckpoint.h new file mode 100644 index 0000000..5f8ccf0 --- /dev/null +++ b/softwareDirectory/AutoVerScheme/formcheckpoint.h @@ -0,0 +1,22 @@ +#ifndef FORMCHECKPOINT_H +#define FORMCHECKPOINT_H + +#include + +namespace Ui { +class FormCheckPoint; +} + +class FormCheckPoint : public QWidget +{ + Q_OBJECT + +public: + explicit FormCheckPoint(QWidget *parent = nullptr); + ~FormCheckPoint(); + +private: + Ui::FormCheckPoint *ui; +}; + +#endif // FORMCHECKPOINT_H diff --git a/softwareDirectory/AutoVerScheme/formcheckpoint.ui b/softwareDirectory/AutoVerScheme/formcheckpoint.ui new file mode 100644 index 0000000..3a6eb47 --- /dev/null +++ b/softwareDirectory/AutoVerScheme/formcheckpoint.ui @@ -0,0 +1,168 @@ + + + FormCheckPoint + + + + 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); + + + + + + + 12 + 75 + true + + + + 检定项目及检定点 + + + + + + + + + + + + + + + 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/formverypoint.cpp b/softwareDirectory/AutoVerScheme/formverypoint.cpp new file mode 100644 index 0000000..d1cec57 --- /dev/null +++ b/softwareDirectory/AutoVerScheme/formverypoint.cpp @@ -0,0 +1,14 @@ +#include "formverypoint.h" +#include "ui_formverypoint.h" + +FormVeryPoint::FormVeryPoint(QWidget *parent) : + QWidget(parent), + ui(new Ui::FormVeryPoint) +{ + ui->setupUi(this); +} + +FormVeryPoint::~FormVeryPoint() +{ + delete ui; +} diff --git a/softwareDirectory/AutoVerScheme/formverypoint.h b/softwareDirectory/AutoVerScheme/formverypoint.h new file mode 100644 index 0000000..bb6555c --- /dev/null +++ b/softwareDirectory/AutoVerScheme/formverypoint.h @@ -0,0 +1,22 @@ +#ifndef FORMVERYPOINT_H +#define FORMVERYPOINT_H + +#include + +namespace Ui { +class FormVeryPoint; +} + +class FormVeryPoint : public QWidget +{ + Q_OBJECT + +public: + explicit FormVeryPoint(QWidget *parent = nullptr); + ~FormVeryPoint(); + +private: + Ui::FormVeryPoint *ui; +}; + +#endif // FORMVERYPOINT_H diff --git a/softwareDirectory/AutoVerScheme/formverypoint.ui b/softwareDirectory/AutoVerScheme/formverypoint.ui new file mode 100644 index 0000000..c7fbf84 --- /dev/null +++ b/softwareDirectory/AutoVerScheme/formverypoint.ui @@ -0,0 +1,168 @@ + + + FormVeryPoint + + + + 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); + + + + + + + 12 + 75 + true + + + + 核查项目及核查点 + + + + + + + + + + + + + + + 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 b7a7f10..4b3cb2b 100644 --- a/softwareDirectory/AutoVerScheme/AutoVerScheme.pro +++ b/softwareDirectory/AutoVerScheme/AutoVerScheme.pro @@ -31,6 +31,8 @@ depar_task.cpp \ depar_task_server.cpp \ dialogcheckresult.cpp \ + formcheckpoint.cpp \ + formverypoint.cpp \ indexwindow.cpp \ infomanageview.cpp \ inspectdataitem.cpp \ @@ -66,6 +68,8 @@ depar_task.h \ depar_task_server.h \ dialogcheckresult.h \ + formcheckpoint.h \ + formverypoint.h \ indexwindow.h \ infomanageview.h \ inspectdataitem.h \ @@ -94,6 +98,8 @@ datasyncview.ui \ depar_task.ui \ dialogcheckresult.ui \ + formcheckpoint.ui \ + formverypoint.ui \ indexwindow.ui \ infomanageview.ui \ inspectdataitem.ui \ diff --git a/softwareDirectory/AutoVerScheme/AutoVerScheme.pro.user b/softwareDirectory/AutoVerScheme/AutoVerScheme.pro.user index b379c65..c5290fc 100644 --- a/softwareDirectory/AutoVerScheme/AutoVerScheme.pro.user +++ b/softwareDirectory/AutoVerScheme/AutoVerScheme.pro.user @@ -1,10 +1,10 @@ - + EnvironmentId - {94e4c4a1-54d4-412c-b108-da01d63f0d97} + {2746248a-b112-4e0f-9ae0-9e61f2a42309} ProjectExplorer.Project.ActiveTarget @@ -55,23 +55,40 @@ ProjectExplorer.Project.PluginSettings + + true + true + true + true + + 0 + true -fno-delayed-template-parsing true + + true + Builtin.TidyAndClazy + 4 + + + + true + ProjectExplorer.Project.Target.0 - Desktop Qt 5.14.2 MinGW 32-bit - Desktop Qt 5.14.2 MinGW 32-bit - qt.qt5.5142.win32_mingw73_kit + 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:/work/code/BJJZ/svntest/softwareDirectory/build-AutoVerScheme-Desktop_Qt_5_14_2_MinGW_32_bit-Debug + D:/dev/software/softwareDirectory/build-AutoVerScheme-Desktop_Qt_5_14_2_MinGW_64_bit-Debug true @@ -119,7 +136,7 @@ 2 - D:/work/code/BJJZ/svntest/softwareDirectory/build-AutoVerScheme-Desktop_Qt_5_14_2_MinGW_32_bit-Release + D:/dev/software/softwareDirectory/build-AutoVerScheme-Desktop_Qt_5_14_2_MinGW_64_bit-Release true @@ -167,7 +184,7 @@ 0 - D:/work/code/BJJZ/svntest/softwareDirectory/build-AutoVerScheme-Desktop_Qt_5_14_2_MinGW_32_bit-Profile + D:/dev/software/softwareDirectory/build-AutoVerScheme-Desktop_Qt_5_14_2_MinGW_64_bit-Profile true @@ -287,8 +304,8 @@ 2 - Qt4ProjectManager.Qt4RunConfiguration:D:/work/code/BJJZ/svntest/softwareDirectory/AutoVerScheme/AutoVerScheme.pro - D:/work/code/BJJZ/svntest/softwareDirectory/AutoVerScheme/AutoVerScheme.pro + Qt4ProjectManager.Qt4RunConfiguration:D:/dev/software/softwareDirectory/AutoVerScheme/AutoVerScheme.pro + D:/dev/software/softwareDirectory/AutoVerScheme/AutoVerScheme.pro false @@ -299,7 +316,7 @@ false true - D:/work/code/BJJZ/svntest/softwareDirectory/build-AutoVerScheme-Desktop_Qt_5_14_2_MinGW_32_bit-Debug + D:/dev/software/softwareDirectory/build-AutoVerScheme-Desktop_Qt_5_14_2_MinGW_64_bit-Debug 1 @@ -307,14 +324,14 @@ ProjectExplorer.Project.Target.1 - Desktop Qt 5.14.2 MinGW 64-bit - Desktop Qt 5.14.2 MinGW 64-bit - qt.qt5.5142.win64_mingw73_kit + 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:/work/code/BJJZ/svntest/softwareDirectory/build-AutoVerScheme-Desktop_Qt_5_14_2_MinGW_64_bit-Debug + D:/dev/software/softwareDirectory/build-AutoVerScheme-Desktop_Qt_5_14_2_MinGW_32_bit-Debug true @@ -362,7 +379,7 @@ 2 - D:/work/code/BJJZ/svntest/softwareDirectory/build-AutoVerScheme-Desktop_Qt_5_14_2_MinGW_64_bit-Release + D:/dev/software/softwareDirectory/build-AutoVerScheme-Desktop_Qt_5_14_2_MinGW_32_bit-Release true @@ -410,7 +427,7 @@ 0 - D:/work/code/BJJZ/svntest/softwareDirectory/build-AutoVerScheme-Desktop_Qt_5_14_2_MinGW_64_bit-Profile + D:/dev/software/softwareDirectory/build-AutoVerScheme-Desktop_Qt_5_14_2_MinGW_32_bit-Profile true @@ -530,14 +547,14 @@ 2 - - ProjectExplorer.CustomExecutableRunConfiguration - + Qt4ProjectManager.Qt4RunConfiguration:D:/dev/software/softwareDirectory/AutoVerScheme/AutoVerScheme.pro + D:/dev/software/softwareDirectory/AutoVerScheme/AutoVerScheme.pro false false true + true false false true diff --git a/softwareDirectory/AutoVerScheme/AutoVerScheme.pro.user.94e4c4a b/softwareDirectory/AutoVerScheme/AutoVerScheme.pro.user.94e4c4a new file mode 100644 index 0000000..742ac25 --- /dev/null +++ b/softwareDirectory/AutoVerScheme/AutoVerScheme.pro.user.94e4c4a @@ -0,0 +1,562 @@ + + + + + + EnvironmentId + {94e4c4a1-54d4-412c-b108-da01d63f0d97} + + + 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 32-bit + Desktop Qt 5.14.2 MinGW 32-bit + qt.qt5.5142.win32_mingw73_kit + 0 + 0 + 0 + + D:/work/code/BJJZ/svntest/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:/work/code/BJJZ/svntest/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:/work/code/BJJZ/svntest/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:/work/code/BJJZ/svntest/softwareDirectory/AutoVerScheme/AutoVerScheme.pro + D:/work/code/BJJZ/svntest/softwareDirectory/AutoVerScheme/AutoVerScheme.pro + + false + + false + true + true + false + false + true + + D:/work/code/BJJZ/svntest/softwareDirectory/build-AutoVerScheme-Desktop_Qt_5_14_2_MinGW_32_bit-Debug + + 1 + + + + ProjectExplorer.Project.Target.1 + + 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:/work/code/BJJZ/svntest/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:/work/code/BJJZ/svntest/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:/work/code/BJJZ/svntest/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 + + + ProjectExplorer.CustomExecutableRunConfiguration + + + false + + false + true + false + false + true + + + + 1 + + + + ProjectExplorer.Project.TargetCount + 2 + + + ProjectExplorer.Project.Updater.FileVersion + 22 + + + Version + 22 + + diff --git a/softwareDirectory/AutoVerScheme/checkdevice.cpp b/softwareDirectory/AutoVerScheme/checkdevice.cpp index 5497af2..d540aa6 100644 --- a/softwareDirectory/AutoVerScheme/checkdevice.cpp +++ b/softwareDirectory/AutoVerScheme/checkdevice.cpp @@ -14,6 +14,7 @@ ui->tableWidget_4->setColumnWidth(0, 80); for(int i=1;i<5;i++) ui->tableWidget_4->horizontalHeader()->setSectionResizeMode(i,QHeaderView::Stretch); + getCheckDevice(); getStandardDevice(); } @@ -22,6 +23,23 @@ delete ui; } +void CheckDevice::getCheckDevice() +{ + int rowCount=0; + int row=0; + QList data = BaseCommonApi::getTestedDevice(); + for (const TestedDevice& bizDevice : data) { + rowCount = ui->tableWidget_3->rowCount(); + ui->tableWidget_3->insertRow(rowCount); + QCheckBox *checkBox = new QCheckBox; + ui->tableWidget_3->setCellWidget(row, 0, checkBox); + ui->tableWidget_4->setItem(row, 1, new QTableWidgetItem(bizDevice.equipment_name)); + ui->tableWidget_4->setItem(row, 2, new QTableWidgetItem(bizDevice.model)); + ui->tableWidget_4->setItem(row, 3, new QTableWidgetItem(bizDevice.help_instruction)); + row++; + } +} + void CheckDevice::getStandardDevice() { int rowCount=0; diff --git a/softwareDirectory/AutoVerScheme/checkdevice.h b/softwareDirectory/AutoVerScheme/checkdevice.h index fc42d90..8102d24 100644 --- a/softwareDirectory/AutoVerScheme/checkdevice.h +++ b/softwareDirectory/AutoVerScheme/checkdevice.h @@ -16,6 +16,7 @@ ~CheckDevice(); private: + void getCheckDevice(); void getStandardDevice(); private: diff --git a/softwareDirectory/AutoVerScheme/depar_task.cpp b/softwareDirectory/AutoVerScheme/depar_task.cpp index 5b5c3ef..ea7c6a2 100644 --- a/softwareDirectory/AutoVerScheme/depar_task.cpp +++ b/softwareDirectory/AutoVerScheme/depar_task.cpp @@ -97,7 +97,7 @@ ui->tableWidget->setItem(row, 5, new QTableWidgetItem(dept.manufacturer)); //设置数据 ui->tableWidget->setItem(row, 6, new QTableWidgetItem(dept.customer_name)); //设置数据 ui->tableWidget->setItem(row, 7, new QTableWidgetItem(dept.FULL_NAME)); //设置数据 - ui->tableWidget->setItem(row, 8, new QTableWidgetItem(dept.require_over_time)); //设置数据 + ui->tableWidget->setItem(row, 8, new QTableWidgetItem(dept.require_over_time.toString())); //设置数据 if(dept.is_urgent=="1") State="是"; else diff --git a/softwareDirectory/AutoVerScheme/formcheckpoint.cpp b/softwareDirectory/AutoVerScheme/formcheckpoint.cpp new file mode 100644 index 0000000..5ff2d74 --- /dev/null +++ b/softwareDirectory/AutoVerScheme/formcheckpoint.cpp @@ -0,0 +1,14 @@ +#include "formcheckpoint.h" +#include "ui_formcheckpoint.h" + +FormCheckPoint::FormCheckPoint(QWidget *parent) : + QWidget(parent), + ui(new Ui::FormCheckPoint) +{ + ui->setupUi(this); +} + +FormCheckPoint::~FormCheckPoint() +{ + delete ui; +} diff --git a/softwareDirectory/AutoVerScheme/formcheckpoint.h b/softwareDirectory/AutoVerScheme/formcheckpoint.h new file mode 100644 index 0000000..5f8ccf0 --- /dev/null +++ b/softwareDirectory/AutoVerScheme/formcheckpoint.h @@ -0,0 +1,22 @@ +#ifndef FORMCHECKPOINT_H +#define FORMCHECKPOINT_H + +#include + +namespace Ui { +class FormCheckPoint; +} + +class FormCheckPoint : public QWidget +{ + Q_OBJECT + +public: + explicit FormCheckPoint(QWidget *parent = nullptr); + ~FormCheckPoint(); + +private: + Ui::FormCheckPoint *ui; +}; + +#endif // FORMCHECKPOINT_H diff --git a/softwareDirectory/AutoVerScheme/formcheckpoint.ui b/softwareDirectory/AutoVerScheme/formcheckpoint.ui new file mode 100644 index 0000000..3a6eb47 --- /dev/null +++ b/softwareDirectory/AutoVerScheme/formcheckpoint.ui @@ -0,0 +1,168 @@ + + + FormCheckPoint + + + + 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); + + + + + + + 12 + 75 + true + + + + 检定项目及检定点 + + + + + + + + + + + + + + + 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/formverypoint.cpp b/softwareDirectory/AutoVerScheme/formverypoint.cpp new file mode 100644 index 0000000..d1cec57 --- /dev/null +++ b/softwareDirectory/AutoVerScheme/formverypoint.cpp @@ -0,0 +1,14 @@ +#include "formverypoint.h" +#include "ui_formverypoint.h" + +FormVeryPoint::FormVeryPoint(QWidget *parent) : + QWidget(parent), + ui(new Ui::FormVeryPoint) +{ + ui->setupUi(this); +} + +FormVeryPoint::~FormVeryPoint() +{ + delete ui; +} diff --git a/softwareDirectory/AutoVerScheme/formverypoint.h b/softwareDirectory/AutoVerScheme/formverypoint.h new file mode 100644 index 0000000..bb6555c --- /dev/null +++ b/softwareDirectory/AutoVerScheme/formverypoint.h @@ -0,0 +1,22 @@ +#ifndef FORMVERYPOINT_H +#define FORMVERYPOINT_H + +#include + +namespace Ui { +class FormVeryPoint; +} + +class FormVeryPoint : public QWidget +{ + Q_OBJECT + +public: + explicit FormVeryPoint(QWidget *parent = nullptr); + ~FormVeryPoint(); + +private: + Ui::FormVeryPoint *ui; +}; + +#endif // FORMVERYPOINT_H diff --git a/softwareDirectory/AutoVerScheme/formverypoint.ui b/softwareDirectory/AutoVerScheme/formverypoint.ui new file mode 100644 index 0000000..c7fbf84 --- /dev/null +++ b/softwareDirectory/AutoVerScheme/formverypoint.ui @@ -0,0 +1,168 @@ + + + FormVeryPoint + + + + 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); + + + + + + + 12 + 75 + true + + + + 核查项目及核查点 + + + + + + + + + + + + + + + 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/my_task.cpp b/softwareDirectory/AutoVerScheme/my_task.cpp index 8d7abf7..fb72684 100644 --- a/softwareDirectory/AutoVerScheme/my_task.cpp +++ b/softwareDirectory/AutoVerScheme/my_task.cpp @@ -89,7 +89,7 @@ ui->tableWidget->setItem(row, 5, new QTableWidgetItem(myTask.manufacturer)); //设置数据 ui->tableWidget->setItem(row, 6, new QTableWidgetItem(myTask.customer_name)); //设置数据 ui->tableWidget->setItem(row, 7, new QTableWidgetItem(myTask.FULL_NAME)); //设置数据 - ui->tableWidget->setItem(row, 8, new QTableWidgetItem(myTask.require_over_time)); //设置数据 + ui->tableWidget->setItem(row, 8, new QTableWidgetItem(myTask.require_over_time.toString())); //设置数据 if(myTask.is_urgent=="1") State="是"; else diff --git a/softwareDirectory/AutoVerScheme/AutoVerScheme.pro b/softwareDirectory/AutoVerScheme/AutoVerScheme.pro index b7a7f10..4b3cb2b 100644 --- a/softwareDirectory/AutoVerScheme/AutoVerScheme.pro +++ b/softwareDirectory/AutoVerScheme/AutoVerScheme.pro @@ -31,6 +31,8 @@ depar_task.cpp \ depar_task_server.cpp \ dialogcheckresult.cpp \ + formcheckpoint.cpp \ + formverypoint.cpp \ indexwindow.cpp \ infomanageview.cpp \ inspectdataitem.cpp \ @@ -66,6 +68,8 @@ depar_task.h \ depar_task_server.h \ dialogcheckresult.h \ + formcheckpoint.h \ + formverypoint.h \ indexwindow.h \ infomanageview.h \ inspectdataitem.h \ @@ -94,6 +98,8 @@ datasyncview.ui \ depar_task.ui \ dialogcheckresult.ui \ + formcheckpoint.ui \ + formverypoint.ui \ indexwindow.ui \ infomanageview.ui \ inspectdataitem.ui \ diff --git a/softwareDirectory/AutoVerScheme/AutoVerScheme.pro.user b/softwareDirectory/AutoVerScheme/AutoVerScheme.pro.user index b379c65..c5290fc 100644 --- a/softwareDirectory/AutoVerScheme/AutoVerScheme.pro.user +++ b/softwareDirectory/AutoVerScheme/AutoVerScheme.pro.user @@ -1,10 +1,10 @@ - + EnvironmentId - {94e4c4a1-54d4-412c-b108-da01d63f0d97} + {2746248a-b112-4e0f-9ae0-9e61f2a42309} ProjectExplorer.Project.ActiveTarget @@ -55,23 +55,40 @@ ProjectExplorer.Project.PluginSettings + + true + true + true + true + + 0 + true -fno-delayed-template-parsing true + + true + Builtin.TidyAndClazy + 4 + + + + true + ProjectExplorer.Project.Target.0 - Desktop Qt 5.14.2 MinGW 32-bit - Desktop Qt 5.14.2 MinGW 32-bit - qt.qt5.5142.win32_mingw73_kit + 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:/work/code/BJJZ/svntest/softwareDirectory/build-AutoVerScheme-Desktop_Qt_5_14_2_MinGW_32_bit-Debug + D:/dev/software/softwareDirectory/build-AutoVerScheme-Desktop_Qt_5_14_2_MinGW_64_bit-Debug true @@ -119,7 +136,7 @@ 2 - D:/work/code/BJJZ/svntest/softwareDirectory/build-AutoVerScheme-Desktop_Qt_5_14_2_MinGW_32_bit-Release + D:/dev/software/softwareDirectory/build-AutoVerScheme-Desktop_Qt_5_14_2_MinGW_64_bit-Release true @@ -167,7 +184,7 @@ 0 - D:/work/code/BJJZ/svntest/softwareDirectory/build-AutoVerScheme-Desktop_Qt_5_14_2_MinGW_32_bit-Profile + D:/dev/software/softwareDirectory/build-AutoVerScheme-Desktop_Qt_5_14_2_MinGW_64_bit-Profile true @@ -287,8 +304,8 @@ 2 - Qt4ProjectManager.Qt4RunConfiguration:D:/work/code/BJJZ/svntest/softwareDirectory/AutoVerScheme/AutoVerScheme.pro - D:/work/code/BJJZ/svntest/softwareDirectory/AutoVerScheme/AutoVerScheme.pro + Qt4ProjectManager.Qt4RunConfiguration:D:/dev/software/softwareDirectory/AutoVerScheme/AutoVerScheme.pro + D:/dev/software/softwareDirectory/AutoVerScheme/AutoVerScheme.pro false @@ -299,7 +316,7 @@ false true - D:/work/code/BJJZ/svntest/softwareDirectory/build-AutoVerScheme-Desktop_Qt_5_14_2_MinGW_32_bit-Debug + D:/dev/software/softwareDirectory/build-AutoVerScheme-Desktop_Qt_5_14_2_MinGW_64_bit-Debug 1 @@ -307,14 +324,14 @@ ProjectExplorer.Project.Target.1 - Desktop Qt 5.14.2 MinGW 64-bit - Desktop Qt 5.14.2 MinGW 64-bit - qt.qt5.5142.win64_mingw73_kit + 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:/work/code/BJJZ/svntest/softwareDirectory/build-AutoVerScheme-Desktop_Qt_5_14_2_MinGW_64_bit-Debug + D:/dev/software/softwareDirectory/build-AutoVerScheme-Desktop_Qt_5_14_2_MinGW_32_bit-Debug true @@ -362,7 +379,7 @@ 2 - D:/work/code/BJJZ/svntest/softwareDirectory/build-AutoVerScheme-Desktop_Qt_5_14_2_MinGW_64_bit-Release + D:/dev/software/softwareDirectory/build-AutoVerScheme-Desktop_Qt_5_14_2_MinGW_32_bit-Release true @@ -410,7 +427,7 @@ 0 - D:/work/code/BJJZ/svntest/softwareDirectory/build-AutoVerScheme-Desktop_Qt_5_14_2_MinGW_64_bit-Profile + D:/dev/software/softwareDirectory/build-AutoVerScheme-Desktop_Qt_5_14_2_MinGW_32_bit-Profile true @@ -530,14 +547,14 @@ 2 - - ProjectExplorer.CustomExecutableRunConfiguration - + Qt4ProjectManager.Qt4RunConfiguration:D:/dev/software/softwareDirectory/AutoVerScheme/AutoVerScheme.pro + D:/dev/software/softwareDirectory/AutoVerScheme/AutoVerScheme.pro false false true + true false false true diff --git a/softwareDirectory/AutoVerScheme/AutoVerScheme.pro.user.94e4c4a b/softwareDirectory/AutoVerScheme/AutoVerScheme.pro.user.94e4c4a new file mode 100644 index 0000000..742ac25 --- /dev/null +++ b/softwareDirectory/AutoVerScheme/AutoVerScheme.pro.user.94e4c4a @@ -0,0 +1,562 @@ + + + + + + EnvironmentId + {94e4c4a1-54d4-412c-b108-da01d63f0d97} + + + 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 32-bit + Desktop Qt 5.14.2 MinGW 32-bit + qt.qt5.5142.win32_mingw73_kit + 0 + 0 + 0 + + D:/work/code/BJJZ/svntest/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:/work/code/BJJZ/svntest/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:/work/code/BJJZ/svntest/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:/work/code/BJJZ/svntest/softwareDirectory/AutoVerScheme/AutoVerScheme.pro + D:/work/code/BJJZ/svntest/softwareDirectory/AutoVerScheme/AutoVerScheme.pro + + false + + false + true + true + false + false + true + + D:/work/code/BJJZ/svntest/softwareDirectory/build-AutoVerScheme-Desktop_Qt_5_14_2_MinGW_32_bit-Debug + + 1 + + + + ProjectExplorer.Project.Target.1 + + 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:/work/code/BJJZ/svntest/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:/work/code/BJJZ/svntest/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:/work/code/BJJZ/svntest/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 + + + ProjectExplorer.CustomExecutableRunConfiguration + + + false + + false + true + false + false + true + + + + 1 + + + + ProjectExplorer.Project.TargetCount + 2 + + + ProjectExplorer.Project.Updater.FileVersion + 22 + + + Version + 22 + + diff --git a/softwareDirectory/AutoVerScheme/checkdevice.cpp b/softwareDirectory/AutoVerScheme/checkdevice.cpp index 5497af2..d540aa6 100644 --- a/softwareDirectory/AutoVerScheme/checkdevice.cpp +++ b/softwareDirectory/AutoVerScheme/checkdevice.cpp @@ -14,6 +14,7 @@ ui->tableWidget_4->setColumnWidth(0, 80); for(int i=1;i<5;i++) ui->tableWidget_4->horizontalHeader()->setSectionResizeMode(i,QHeaderView::Stretch); + getCheckDevice(); getStandardDevice(); } @@ -22,6 +23,23 @@ delete ui; } +void CheckDevice::getCheckDevice() +{ + int rowCount=0; + int row=0; + QList data = BaseCommonApi::getTestedDevice(); + for (const TestedDevice& bizDevice : data) { + rowCount = ui->tableWidget_3->rowCount(); + ui->tableWidget_3->insertRow(rowCount); + QCheckBox *checkBox = new QCheckBox; + ui->tableWidget_3->setCellWidget(row, 0, checkBox); + ui->tableWidget_4->setItem(row, 1, new QTableWidgetItem(bizDevice.equipment_name)); + ui->tableWidget_4->setItem(row, 2, new QTableWidgetItem(bizDevice.model)); + ui->tableWidget_4->setItem(row, 3, new QTableWidgetItem(bizDevice.help_instruction)); + row++; + } +} + void CheckDevice::getStandardDevice() { int rowCount=0; diff --git a/softwareDirectory/AutoVerScheme/checkdevice.h b/softwareDirectory/AutoVerScheme/checkdevice.h index fc42d90..8102d24 100644 --- a/softwareDirectory/AutoVerScheme/checkdevice.h +++ b/softwareDirectory/AutoVerScheme/checkdevice.h @@ -16,6 +16,7 @@ ~CheckDevice(); private: + void getCheckDevice(); void getStandardDevice(); private: diff --git a/softwareDirectory/AutoVerScheme/depar_task.cpp b/softwareDirectory/AutoVerScheme/depar_task.cpp index 5b5c3ef..ea7c6a2 100644 --- a/softwareDirectory/AutoVerScheme/depar_task.cpp +++ b/softwareDirectory/AutoVerScheme/depar_task.cpp @@ -97,7 +97,7 @@ ui->tableWidget->setItem(row, 5, new QTableWidgetItem(dept.manufacturer)); //设置数据 ui->tableWidget->setItem(row, 6, new QTableWidgetItem(dept.customer_name)); //设置数据 ui->tableWidget->setItem(row, 7, new QTableWidgetItem(dept.FULL_NAME)); //设置数据 - ui->tableWidget->setItem(row, 8, new QTableWidgetItem(dept.require_over_time)); //设置数据 + ui->tableWidget->setItem(row, 8, new QTableWidgetItem(dept.require_over_time.toString())); //设置数据 if(dept.is_urgent=="1") State="是"; else diff --git a/softwareDirectory/AutoVerScheme/formcheckpoint.cpp b/softwareDirectory/AutoVerScheme/formcheckpoint.cpp new file mode 100644 index 0000000..5ff2d74 --- /dev/null +++ b/softwareDirectory/AutoVerScheme/formcheckpoint.cpp @@ -0,0 +1,14 @@ +#include "formcheckpoint.h" +#include "ui_formcheckpoint.h" + +FormCheckPoint::FormCheckPoint(QWidget *parent) : + QWidget(parent), + ui(new Ui::FormCheckPoint) +{ + ui->setupUi(this); +} + +FormCheckPoint::~FormCheckPoint() +{ + delete ui; +} diff --git a/softwareDirectory/AutoVerScheme/formcheckpoint.h b/softwareDirectory/AutoVerScheme/formcheckpoint.h new file mode 100644 index 0000000..5f8ccf0 --- /dev/null +++ b/softwareDirectory/AutoVerScheme/formcheckpoint.h @@ -0,0 +1,22 @@ +#ifndef FORMCHECKPOINT_H +#define FORMCHECKPOINT_H + +#include + +namespace Ui { +class FormCheckPoint; +} + +class FormCheckPoint : public QWidget +{ + Q_OBJECT + +public: + explicit FormCheckPoint(QWidget *parent = nullptr); + ~FormCheckPoint(); + +private: + Ui::FormCheckPoint *ui; +}; + +#endif // FORMCHECKPOINT_H diff --git a/softwareDirectory/AutoVerScheme/formcheckpoint.ui b/softwareDirectory/AutoVerScheme/formcheckpoint.ui new file mode 100644 index 0000000..3a6eb47 --- /dev/null +++ b/softwareDirectory/AutoVerScheme/formcheckpoint.ui @@ -0,0 +1,168 @@ + + + FormCheckPoint + + + + 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); + + + + + + + 12 + 75 + true + + + + 检定项目及检定点 + + + + + + + + + + + + + + + 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/formverypoint.cpp b/softwareDirectory/AutoVerScheme/formverypoint.cpp new file mode 100644 index 0000000..d1cec57 --- /dev/null +++ b/softwareDirectory/AutoVerScheme/formverypoint.cpp @@ -0,0 +1,14 @@ +#include "formverypoint.h" +#include "ui_formverypoint.h" + +FormVeryPoint::FormVeryPoint(QWidget *parent) : + QWidget(parent), + ui(new Ui::FormVeryPoint) +{ + ui->setupUi(this); +} + +FormVeryPoint::~FormVeryPoint() +{ + delete ui; +} diff --git a/softwareDirectory/AutoVerScheme/formverypoint.h b/softwareDirectory/AutoVerScheme/formverypoint.h new file mode 100644 index 0000000..bb6555c --- /dev/null +++ b/softwareDirectory/AutoVerScheme/formverypoint.h @@ -0,0 +1,22 @@ +#ifndef FORMVERYPOINT_H +#define FORMVERYPOINT_H + +#include + +namespace Ui { +class FormVeryPoint; +} + +class FormVeryPoint : public QWidget +{ + Q_OBJECT + +public: + explicit FormVeryPoint(QWidget *parent = nullptr); + ~FormVeryPoint(); + +private: + Ui::FormVeryPoint *ui; +}; + +#endif // FORMVERYPOINT_H diff --git a/softwareDirectory/AutoVerScheme/formverypoint.ui b/softwareDirectory/AutoVerScheme/formverypoint.ui new file mode 100644 index 0000000..c7fbf84 --- /dev/null +++ b/softwareDirectory/AutoVerScheme/formverypoint.ui @@ -0,0 +1,168 @@ + + + FormVeryPoint + + + + 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); + + + + + + + 12 + 75 + true + + + + 核查项目及核查点 + + + + + + + + + + + + + + + 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/my_task.cpp b/softwareDirectory/AutoVerScheme/my_task.cpp index 8d7abf7..fb72684 100644 --- a/softwareDirectory/AutoVerScheme/my_task.cpp +++ b/softwareDirectory/AutoVerScheme/my_task.cpp @@ -89,7 +89,7 @@ ui->tableWidget->setItem(row, 5, new QTableWidgetItem(myTask.manufacturer)); //设置数据 ui->tableWidget->setItem(row, 6, new QTableWidgetItem(myTask.customer_name)); //设置数据 ui->tableWidget->setItem(row, 7, new QTableWidgetItem(myTask.FULL_NAME)); //设置数据 - ui->tableWidget->setItem(row, 8, new QTableWidgetItem(myTask.require_over_time)); //设置数据 + ui->tableWidget->setItem(row, 8, new QTableWidgetItem(myTask.require_over_time.toString())); //设置数据 if(myTask.is_urgent=="1") State="是"; else diff --git a/softwareDirectory/AutoVerScheme/newcheckmethod.cpp b/softwareDirectory/AutoVerScheme/newcheckmethod.cpp index 9f0160a..eee7e48 100644 --- a/softwareDirectory/AutoVerScheme/newcheckmethod.cpp +++ b/softwareDirectory/AutoVerScheme/newcheckmethod.cpp @@ -2,6 +2,7 @@ #include "ui_newcheckmethod.h" #include "checkdevice.h" #include "qfiledialog.h" +#include "formcheckpoint.h" NewCheckMethod::NewCheckMethod(QWidget *parent) : QWidget(parent), @@ -40,3 +41,11 @@ { ui->label_11->clear(); } + +void NewCheckMethod::showCheckPoint() +{ + FormCheckPoint *checkWindow = new FormCheckPoint; + //checkWindow.setWindowState(Qt::WindowMaximized); + checkWindow->setWindowModality(Qt::ApplicationModal); + checkWindow->show(); +} diff --git a/softwareDirectory/AutoVerScheme/AutoVerScheme.pro b/softwareDirectory/AutoVerScheme/AutoVerScheme.pro index b7a7f10..4b3cb2b 100644 --- a/softwareDirectory/AutoVerScheme/AutoVerScheme.pro +++ b/softwareDirectory/AutoVerScheme/AutoVerScheme.pro @@ -31,6 +31,8 @@ depar_task.cpp \ depar_task_server.cpp \ dialogcheckresult.cpp \ + formcheckpoint.cpp \ + formverypoint.cpp \ indexwindow.cpp \ infomanageview.cpp \ inspectdataitem.cpp \ @@ -66,6 +68,8 @@ depar_task.h \ depar_task_server.h \ dialogcheckresult.h \ + formcheckpoint.h \ + formverypoint.h \ indexwindow.h \ infomanageview.h \ inspectdataitem.h \ @@ -94,6 +98,8 @@ datasyncview.ui \ depar_task.ui \ dialogcheckresult.ui \ + formcheckpoint.ui \ + formverypoint.ui \ indexwindow.ui \ infomanageview.ui \ inspectdataitem.ui \ diff --git a/softwareDirectory/AutoVerScheme/AutoVerScheme.pro.user b/softwareDirectory/AutoVerScheme/AutoVerScheme.pro.user index b379c65..c5290fc 100644 --- a/softwareDirectory/AutoVerScheme/AutoVerScheme.pro.user +++ b/softwareDirectory/AutoVerScheme/AutoVerScheme.pro.user @@ -1,10 +1,10 @@ - + EnvironmentId - {94e4c4a1-54d4-412c-b108-da01d63f0d97} + {2746248a-b112-4e0f-9ae0-9e61f2a42309} ProjectExplorer.Project.ActiveTarget @@ -55,23 +55,40 @@ ProjectExplorer.Project.PluginSettings + + true + true + true + true + + 0 + true -fno-delayed-template-parsing true + + true + Builtin.TidyAndClazy + 4 + + + + true + ProjectExplorer.Project.Target.0 - Desktop Qt 5.14.2 MinGW 32-bit - Desktop Qt 5.14.2 MinGW 32-bit - qt.qt5.5142.win32_mingw73_kit + 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:/work/code/BJJZ/svntest/softwareDirectory/build-AutoVerScheme-Desktop_Qt_5_14_2_MinGW_32_bit-Debug + D:/dev/software/softwareDirectory/build-AutoVerScheme-Desktop_Qt_5_14_2_MinGW_64_bit-Debug true @@ -119,7 +136,7 @@ 2 - D:/work/code/BJJZ/svntest/softwareDirectory/build-AutoVerScheme-Desktop_Qt_5_14_2_MinGW_32_bit-Release + D:/dev/software/softwareDirectory/build-AutoVerScheme-Desktop_Qt_5_14_2_MinGW_64_bit-Release true @@ -167,7 +184,7 @@ 0 - D:/work/code/BJJZ/svntest/softwareDirectory/build-AutoVerScheme-Desktop_Qt_5_14_2_MinGW_32_bit-Profile + D:/dev/software/softwareDirectory/build-AutoVerScheme-Desktop_Qt_5_14_2_MinGW_64_bit-Profile true @@ -287,8 +304,8 @@ 2 - Qt4ProjectManager.Qt4RunConfiguration:D:/work/code/BJJZ/svntest/softwareDirectory/AutoVerScheme/AutoVerScheme.pro - D:/work/code/BJJZ/svntest/softwareDirectory/AutoVerScheme/AutoVerScheme.pro + Qt4ProjectManager.Qt4RunConfiguration:D:/dev/software/softwareDirectory/AutoVerScheme/AutoVerScheme.pro + D:/dev/software/softwareDirectory/AutoVerScheme/AutoVerScheme.pro false @@ -299,7 +316,7 @@ false true - D:/work/code/BJJZ/svntest/softwareDirectory/build-AutoVerScheme-Desktop_Qt_5_14_2_MinGW_32_bit-Debug + D:/dev/software/softwareDirectory/build-AutoVerScheme-Desktop_Qt_5_14_2_MinGW_64_bit-Debug 1 @@ -307,14 +324,14 @@ ProjectExplorer.Project.Target.1 - Desktop Qt 5.14.2 MinGW 64-bit - Desktop Qt 5.14.2 MinGW 64-bit - qt.qt5.5142.win64_mingw73_kit + 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:/work/code/BJJZ/svntest/softwareDirectory/build-AutoVerScheme-Desktop_Qt_5_14_2_MinGW_64_bit-Debug + D:/dev/software/softwareDirectory/build-AutoVerScheme-Desktop_Qt_5_14_2_MinGW_32_bit-Debug true @@ -362,7 +379,7 @@ 2 - D:/work/code/BJJZ/svntest/softwareDirectory/build-AutoVerScheme-Desktop_Qt_5_14_2_MinGW_64_bit-Release + D:/dev/software/softwareDirectory/build-AutoVerScheme-Desktop_Qt_5_14_2_MinGW_32_bit-Release true @@ -410,7 +427,7 @@ 0 - D:/work/code/BJJZ/svntest/softwareDirectory/build-AutoVerScheme-Desktop_Qt_5_14_2_MinGW_64_bit-Profile + D:/dev/software/softwareDirectory/build-AutoVerScheme-Desktop_Qt_5_14_2_MinGW_32_bit-Profile true @@ -530,14 +547,14 @@ 2 - - ProjectExplorer.CustomExecutableRunConfiguration - + Qt4ProjectManager.Qt4RunConfiguration:D:/dev/software/softwareDirectory/AutoVerScheme/AutoVerScheme.pro + D:/dev/software/softwareDirectory/AutoVerScheme/AutoVerScheme.pro false false true + true false false true diff --git a/softwareDirectory/AutoVerScheme/AutoVerScheme.pro.user.94e4c4a b/softwareDirectory/AutoVerScheme/AutoVerScheme.pro.user.94e4c4a new file mode 100644 index 0000000..742ac25 --- /dev/null +++ b/softwareDirectory/AutoVerScheme/AutoVerScheme.pro.user.94e4c4a @@ -0,0 +1,562 @@ + + + + + + EnvironmentId + {94e4c4a1-54d4-412c-b108-da01d63f0d97} + + + 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 32-bit + Desktop Qt 5.14.2 MinGW 32-bit + qt.qt5.5142.win32_mingw73_kit + 0 + 0 + 0 + + D:/work/code/BJJZ/svntest/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:/work/code/BJJZ/svntest/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:/work/code/BJJZ/svntest/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:/work/code/BJJZ/svntest/softwareDirectory/AutoVerScheme/AutoVerScheme.pro + D:/work/code/BJJZ/svntest/softwareDirectory/AutoVerScheme/AutoVerScheme.pro + + false + + false + true + true + false + false + true + + D:/work/code/BJJZ/svntest/softwareDirectory/build-AutoVerScheme-Desktop_Qt_5_14_2_MinGW_32_bit-Debug + + 1 + + + + ProjectExplorer.Project.Target.1 + + 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:/work/code/BJJZ/svntest/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:/work/code/BJJZ/svntest/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:/work/code/BJJZ/svntest/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 + + + ProjectExplorer.CustomExecutableRunConfiguration + + + false + + false + true + false + false + true + + + + 1 + + + + ProjectExplorer.Project.TargetCount + 2 + + + ProjectExplorer.Project.Updater.FileVersion + 22 + + + Version + 22 + + diff --git a/softwareDirectory/AutoVerScheme/checkdevice.cpp b/softwareDirectory/AutoVerScheme/checkdevice.cpp index 5497af2..d540aa6 100644 --- a/softwareDirectory/AutoVerScheme/checkdevice.cpp +++ b/softwareDirectory/AutoVerScheme/checkdevice.cpp @@ -14,6 +14,7 @@ ui->tableWidget_4->setColumnWidth(0, 80); for(int i=1;i<5;i++) ui->tableWidget_4->horizontalHeader()->setSectionResizeMode(i,QHeaderView::Stretch); + getCheckDevice(); getStandardDevice(); } @@ -22,6 +23,23 @@ delete ui; } +void CheckDevice::getCheckDevice() +{ + int rowCount=0; + int row=0; + QList data = BaseCommonApi::getTestedDevice(); + for (const TestedDevice& bizDevice : data) { + rowCount = ui->tableWidget_3->rowCount(); + ui->tableWidget_3->insertRow(rowCount); + QCheckBox *checkBox = new QCheckBox; + ui->tableWidget_3->setCellWidget(row, 0, checkBox); + ui->tableWidget_4->setItem(row, 1, new QTableWidgetItem(bizDevice.equipment_name)); + ui->tableWidget_4->setItem(row, 2, new QTableWidgetItem(bizDevice.model)); + ui->tableWidget_4->setItem(row, 3, new QTableWidgetItem(bizDevice.help_instruction)); + row++; + } +} + void CheckDevice::getStandardDevice() { int rowCount=0; diff --git a/softwareDirectory/AutoVerScheme/checkdevice.h b/softwareDirectory/AutoVerScheme/checkdevice.h index fc42d90..8102d24 100644 --- a/softwareDirectory/AutoVerScheme/checkdevice.h +++ b/softwareDirectory/AutoVerScheme/checkdevice.h @@ -16,6 +16,7 @@ ~CheckDevice(); private: + void getCheckDevice(); void getStandardDevice(); private: diff --git a/softwareDirectory/AutoVerScheme/depar_task.cpp b/softwareDirectory/AutoVerScheme/depar_task.cpp index 5b5c3ef..ea7c6a2 100644 --- a/softwareDirectory/AutoVerScheme/depar_task.cpp +++ b/softwareDirectory/AutoVerScheme/depar_task.cpp @@ -97,7 +97,7 @@ ui->tableWidget->setItem(row, 5, new QTableWidgetItem(dept.manufacturer)); //设置数据 ui->tableWidget->setItem(row, 6, new QTableWidgetItem(dept.customer_name)); //设置数据 ui->tableWidget->setItem(row, 7, new QTableWidgetItem(dept.FULL_NAME)); //设置数据 - ui->tableWidget->setItem(row, 8, new QTableWidgetItem(dept.require_over_time)); //设置数据 + ui->tableWidget->setItem(row, 8, new QTableWidgetItem(dept.require_over_time.toString())); //设置数据 if(dept.is_urgent=="1") State="是"; else diff --git a/softwareDirectory/AutoVerScheme/formcheckpoint.cpp b/softwareDirectory/AutoVerScheme/formcheckpoint.cpp new file mode 100644 index 0000000..5ff2d74 --- /dev/null +++ b/softwareDirectory/AutoVerScheme/formcheckpoint.cpp @@ -0,0 +1,14 @@ +#include "formcheckpoint.h" +#include "ui_formcheckpoint.h" + +FormCheckPoint::FormCheckPoint(QWidget *parent) : + QWidget(parent), + ui(new Ui::FormCheckPoint) +{ + ui->setupUi(this); +} + +FormCheckPoint::~FormCheckPoint() +{ + delete ui; +} diff --git a/softwareDirectory/AutoVerScheme/formcheckpoint.h b/softwareDirectory/AutoVerScheme/formcheckpoint.h new file mode 100644 index 0000000..5f8ccf0 --- /dev/null +++ b/softwareDirectory/AutoVerScheme/formcheckpoint.h @@ -0,0 +1,22 @@ +#ifndef FORMCHECKPOINT_H +#define FORMCHECKPOINT_H + +#include + +namespace Ui { +class FormCheckPoint; +} + +class FormCheckPoint : public QWidget +{ + Q_OBJECT + +public: + explicit FormCheckPoint(QWidget *parent = nullptr); + ~FormCheckPoint(); + +private: + Ui::FormCheckPoint *ui; +}; + +#endif // FORMCHECKPOINT_H diff --git a/softwareDirectory/AutoVerScheme/formcheckpoint.ui b/softwareDirectory/AutoVerScheme/formcheckpoint.ui new file mode 100644 index 0000000..3a6eb47 --- /dev/null +++ b/softwareDirectory/AutoVerScheme/formcheckpoint.ui @@ -0,0 +1,168 @@ + + + FormCheckPoint + + + + 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); + + + + + + + 12 + 75 + true + + + + 检定项目及检定点 + + + + + + + + + + + + + + + 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/formverypoint.cpp b/softwareDirectory/AutoVerScheme/formverypoint.cpp new file mode 100644 index 0000000..d1cec57 --- /dev/null +++ b/softwareDirectory/AutoVerScheme/formverypoint.cpp @@ -0,0 +1,14 @@ +#include "formverypoint.h" +#include "ui_formverypoint.h" + +FormVeryPoint::FormVeryPoint(QWidget *parent) : + QWidget(parent), + ui(new Ui::FormVeryPoint) +{ + ui->setupUi(this); +} + +FormVeryPoint::~FormVeryPoint() +{ + delete ui; +} diff --git a/softwareDirectory/AutoVerScheme/formverypoint.h b/softwareDirectory/AutoVerScheme/formverypoint.h new file mode 100644 index 0000000..bb6555c --- /dev/null +++ b/softwareDirectory/AutoVerScheme/formverypoint.h @@ -0,0 +1,22 @@ +#ifndef FORMVERYPOINT_H +#define FORMVERYPOINT_H + +#include + +namespace Ui { +class FormVeryPoint; +} + +class FormVeryPoint : public QWidget +{ + Q_OBJECT + +public: + explicit FormVeryPoint(QWidget *parent = nullptr); + ~FormVeryPoint(); + +private: + Ui::FormVeryPoint *ui; +}; + +#endif // FORMVERYPOINT_H diff --git a/softwareDirectory/AutoVerScheme/formverypoint.ui b/softwareDirectory/AutoVerScheme/formverypoint.ui new file mode 100644 index 0000000..c7fbf84 --- /dev/null +++ b/softwareDirectory/AutoVerScheme/formverypoint.ui @@ -0,0 +1,168 @@ + + + FormVeryPoint + + + + 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); + + + + + + + 12 + 75 + true + + + + 核查项目及核查点 + + + + + + + + + + + + + + + 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/my_task.cpp b/softwareDirectory/AutoVerScheme/my_task.cpp index 8d7abf7..fb72684 100644 --- a/softwareDirectory/AutoVerScheme/my_task.cpp +++ b/softwareDirectory/AutoVerScheme/my_task.cpp @@ -89,7 +89,7 @@ ui->tableWidget->setItem(row, 5, new QTableWidgetItem(myTask.manufacturer)); //设置数据 ui->tableWidget->setItem(row, 6, new QTableWidgetItem(myTask.customer_name)); //设置数据 ui->tableWidget->setItem(row, 7, new QTableWidgetItem(myTask.FULL_NAME)); //设置数据 - ui->tableWidget->setItem(row, 8, new QTableWidgetItem(myTask.require_over_time)); //设置数据 + ui->tableWidget->setItem(row, 8, new QTableWidgetItem(myTask.require_over_time.toString())); //设置数据 if(myTask.is_urgent=="1") State="是"; else diff --git a/softwareDirectory/AutoVerScheme/newcheckmethod.cpp b/softwareDirectory/AutoVerScheme/newcheckmethod.cpp index 9f0160a..eee7e48 100644 --- a/softwareDirectory/AutoVerScheme/newcheckmethod.cpp +++ b/softwareDirectory/AutoVerScheme/newcheckmethod.cpp @@ -2,6 +2,7 @@ #include "ui_newcheckmethod.h" #include "checkdevice.h" #include "qfiledialog.h" +#include "formcheckpoint.h" NewCheckMethod::NewCheckMethod(QWidget *parent) : QWidget(parent), @@ -40,3 +41,11 @@ { ui->label_11->clear(); } + +void NewCheckMethod::showCheckPoint() +{ + FormCheckPoint *checkWindow = new FormCheckPoint; + //checkWindow.setWindowState(Qt::WindowMaximized); + checkWindow->setWindowModality(Qt::ApplicationModal); + checkWindow->show(); +} diff --git a/softwareDirectory/AutoVerScheme/newcheckmethod.h b/softwareDirectory/AutoVerScheme/newcheckmethod.h index e923401..8a26b0f 100644 --- a/softwareDirectory/AutoVerScheme/newcheckmethod.h +++ b/softwareDirectory/AutoVerScheme/newcheckmethod.h @@ -18,6 +18,7 @@ void showCheckDevice(); void choosePicture(); void deletePicture(); + void showCheckPoint(); private: Ui::NewCheckMethod *ui; diff --git a/softwareDirectory/AutoVerScheme/AutoVerScheme.pro b/softwareDirectory/AutoVerScheme/AutoVerScheme.pro index b7a7f10..4b3cb2b 100644 --- a/softwareDirectory/AutoVerScheme/AutoVerScheme.pro +++ b/softwareDirectory/AutoVerScheme/AutoVerScheme.pro @@ -31,6 +31,8 @@ depar_task.cpp \ depar_task_server.cpp \ dialogcheckresult.cpp \ + formcheckpoint.cpp \ + formverypoint.cpp \ indexwindow.cpp \ infomanageview.cpp \ inspectdataitem.cpp \ @@ -66,6 +68,8 @@ depar_task.h \ depar_task_server.h \ dialogcheckresult.h \ + formcheckpoint.h \ + formverypoint.h \ indexwindow.h \ infomanageview.h \ inspectdataitem.h \ @@ -94,6 +98,8 @@ datasyncview.ui \ depar_task.ui \ dialogcheckresult.ui \ + formcheckpoint.ui \ + formverypoint.ui \ indexwindow.ui \ infomanageview.ui \ inspectdataitem.ui \ diff --git a/softwareDirectory/AutoVerScheme/AutoVerScheme.pro.user b/softwareDirectory/AutoVerScheme/AutoVerScheme.pro.user index b379c65..c5290fc 100644 --- a/softwareDirectory/AutoVerScheme/AutoVerScheme.pro.user +++ b/softwareDirectory/AutoVerScheme/AutoVerScheme.pro.user @@ -1,10 +1,10 @@ - + EnvironmentId - {94e4c4a1-54d4-412c-b108-da01d63f0d97} + {2746248a-b112-4e0f-9ae0-9e61f2a42309} ProjectExplorer.Project.ActiveTarget @@ -55,23 +55,40 @@ ProjectExplorer.Project.PluginSettings + + true + true + true + true + + 0 + true -fno-delayed-template-parsing true + + true + Builtin.TidyAndClazy + 4 + + + + true + ProjectExplorer.Project.Target.0 - Desktop Qt 5.14.2 MinGW 32-bit - Desktop Qt 5.14.2 MinGW 32-bit - qt.qt5.5142.win32_mingw73_kit + 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:/work/code/BJJZ/svntest/softwareDirectory/build-AutoVerScheme-Desktop_Qt_5_14_2_MinGW_32_bit-Debug + D:/dev/software/softwareDirectory/build-AutoVerScheme-Desktop_Qt_5_14_2_MinGW_64_bit-Debug true @@ -119,7 +136,7 @@ 2 - D:/work/code/BJJZ/svntest/softwareDirectory/build-AutoVerScheme-Desktop_Qt_5_14_2_MinGW_32_bit-Release + D:/dev/software/softwareDirectory/build-AutoVerScheme-Desktop_Qt_5_14_2_MinGW_64_bit-Release true @@ -167,7 +184,7 @@ 0 - D:/work/code/BJJZ/svntest/softwareDirectory/build-AutoVerScheme-Desktop_Qt_5_14_2_MinGW_32_bit-Profile + D:/dev/software/softwareDirectory/build-AutoVerScheme-Desktop_Qt_5_14_2_MinGW_64_bit-Profile true @@ -287,8 +304,8 @@ 2 - Qt4ProjectManager.Qt4RunConfiguration:D:/work/code/BJJZ/svntest/softwareDirectory/AutoVerScheme/AutoVerScheme.pro - D:/work/code/BJJZ/svntest/softwareDirectory/AutoVerScheme/AutoVerScheme.pro + Qt4ProjectManager.Qt4RunConfiguration:D:/dev/software/softwareDirectory/AutoVerScheme/AutoVerScheme.pro + D:/dev/software/softwareDirectory/AutoVerScheme/AutoVerScheme.pro false @@ -299,7 +316,7 @@ false true - D:/work/code/BJJZ/svntest/softwareDirectory/build-AutoVerScheme-Desktop_Qt_5_14_2_MinGW_32_bit-Debug + D:/dev/software/softwareDirectory/build-AutoVerScheme-Desktop_Qt_5_14_2_MinGW_64_bit-Debug 1 @@ -307,14 +324,14 @@ ProjectExplorer.Project.Target.1 - Desktop Qt 5.14.2 MinGW 64-bit - Desktop Qt 5.14.2 MinGW 64-bit - qt.qt5.5142.win64_mingw73_kit + 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:/work/code/BJJZ/svntest/softwareDirectory/build-AutoVerScheme-Desktop_Qt_5_14_2_MinGW_64_bit-Debug + D:/dev/software/softwareDirectory/build-AutoVerScheme-Desktop_Qt_5_14_2_MinGW_32_bit-Debug true @@ -362,7 +379,7 @@ 2 - D:/work/code/BJJZ/svntest/softwareDirectory/build-AutoVerScheme-Desktop_Qt_5_14_2_MinGW_64_bit-Release + D:/dev/software/softwareDirectory/build-AutoVerScheme-Desktop_Qt_5_14_2_MinGW_32_bit-Release true @@ -410,7 +427,7 @@ 0 - D:/work/code/BJJZ/svntest/softwareDirectory/build-AutoVerScheme-Desktop_Qt_5_14_2_MinGW_64_bit-Profile + D:/dev/software/softwareDirectory/build-AutoVerScheme-Desktop_Qt_5_14_2_MinGW_32_bit-Profile true @@ -530,14 +547,14 @@ 2 - - ProjectExplorer.CustomExecutableRunConfiguration - + Qt4ProjectManager.Qt4RunConfiguration:D:/dev/software/softwareDirectory/AutoVerScheme/AutoVerScheme.pro + D:/dev/software/softwareDirectory/AutoVerScheme/AutoVerScheme.pro false false true + true false false true diff --git a/softwareDirectory/AutoVerScheme/AutoVerScheme.pro.user.94e4c4a b/softwareDirectory/AutoVerScheme/AutoVerScheme.pro.user.94e4c4a new file mode 100644 index 0000000..742ac25 --- /dev/null +++ b/softwareDirectory/AutoVerScheme/AutoVerScheme.pro.user.94e4c4a @@ -0,0 +1,562 @@ + + + + + + EnvironmentId + {94e4c4a1-54d4-412c-b108-da01d63f0d97} + + + 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 32-bit + Desktop Qt 5.14.2 MinGW 32-bit + qt.qt5.5142.win32_mingw73_kit + 0 + 0 + 0 + + D:/work/code/BJJZ/svntest/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:/work/code/BJJZ/svntest/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:/work/code/BJJZ/svntest/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:/work/code/BJJZ/svntest/softwareDirectory/AutoVerScheme/AutoVerScheme.pro + D:/work/code/BJJZ/svntest/softwareDirectory/AutoVerScheme/AutoVerScheme.pro + + false + + false + true + true + false + false + true + + D:/work/code/BJJZ/svntest/softwareDirectory/build-AutoVerScheme-Desktop_Qt_5_14_2_MinGW_32_bit-Debug + + 1 + + + + ProjectExplorer.Project.Target.1 + + 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:/work/code/BJJZ/svntest/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:/work/code/BJJZ/svntest/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:/work/code/BJJZ/svntest/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 + + + ProjectExplorer.CustomExecutableRunConfiguration + + + false + + false + true + false + false + true + + + + 1 + + + + ProjectExplorer.Project.TargetCount + 2 + + + ProjectExplorer.Project.Updater.FileVersion + 22 + + + Version + 22 + + diff --git a/softwareDirectory/AutoVerScheme/checkdevice.cpp b/softwareDirectory/AutoVerScheme/checkdevice.cpp index 5497af2..d540aa6 100644 --- a/softwareDirectory/AutoVerScheme/checkdevice.cpp +++ b/softwareDirectory/AutoVerScheme/checkdevice.cpp @@ -14,6 +14,7 @@ ui->tableWidget_4->setColumnWidth(0, 80); for(int i=1;i<5;i++) ui->tableWidget_4->horizontalHeader()->setSectionResizeMode(i,QHeaderView::Stretch); + getCheckDevice(); getStandardDevice(); } @@ -22,6 +23,23 @@ delete ui; } +void CheckDevice::getCheckDevice() +{ + int rowCount=0; + int row=0; + QList data = BaseCommonApi::getTestedDevice(); + for (const TestedDevice& bizDevice : data) { + rowCount = ui->tableWidget_3->rowCount(); + ui->tableWidget_3->insertRow(rowCount); + QCheckBox *checkBox = new QCheckBox; + ui->tableWidget_3->setCellWidget(row, 0, checkBox); + ui->tableWidget_4->setItem(row, 1, new QTableWidgetItem(bizDevice.equipment_name)); + ui->tableWidget_4->setItem(row, 2, new QTableWidgetItem(bizDevice.model)); + ui->tableWidget_4->setItem(row, 3, new QTableWidgetItem(bizDevice.help_instruction)); + row++; + } +} + void CheckDevice::getStandardDevice() { int rowCount=0; diff --git a/softwareDirectory/AutoVerScheme/checkdevice.h b/softwareDirectory/AutoVerScheme/checkdevice.h index fc42d90..8102d24 100644 --- a/softwareDirectory/AutoVerScheme/checkdevice.h +++ b/softwareDirectory/AutoVerScheme/checkdevice.h @@ -16,6 +16,7 @@ ~CheckDevice(); private: + void getCheckDevice(); void getStandardDevice(); private: diff --git a/softwareDirectory/AutoVerScheme/depar_task.cpp b/softwareDirectory/AutoVerScheme/depar_task.cpp index 5b5c3ef..ea7c6a2 100644 --- a/softwareDirectory/AutoVerScheme/depar_task.cpp +++ b/softwareDirectory/AutoVerScheme/depar_task.cpp @@ -97,7 +97,7 @@ ui->tableWidget->setItem(row, 5, new QTableWidgetItem(dept.manufacturer)); //设置数据 ui->tableWidget->setItem(row, 6, new QTableWidgetItem(dept.customer_name)); //设置数据 ui->tableWidget->setItem(row, 7, new QTableWidgetItem(dept.FULL_NAME)); //设置数据 - ui->tableWidget->setItem(row, 8, new QTableWidgetItem(dept.require_over_time)); //设置数据 + ui->tableWidget->setItem(row, 8, new QTableWidgetItem(dept.require_over_time.toString())); //设置数据 if(dept.is_urgent=="1") State="是"; else diff --git a/softwareDirectory/AutoVerScheme/formcheckpoint.cpp b/softwareDirectory/AutoVerScheme/formcheckpoint.cpp new file mode 100644 index 0000000..5ff2d74 --- /dev/null +++ b/softwareDirectory/AutoVerScheme/formcheckpoint.cpp @@ -0,0 +1,14 @@ +#include "formcheckpoint.h" +#include "ui_formcheckpoint.h" + +FormCheckPoint::FormCheckPoint(QWidget *parent) : + QWidget(parent), + ui(new Ui::FormCheckPoint) +{ + ui->setupUi(this); +} + +FormCheckPoint::~FormCheckPoint() +{ + delete ui; +} diff --git a/softwareDirectory/AutoVerScheme/formcheckpoint.h b/softwareDirectory/AutoVerScheme/formcheckpoint.h new file mode 100644 index 0000000..5f8ccf0 --- /dev/null +++ b/softwareDirectory/AutoVerScheme/formcheckpoint.h @@ -0,0 +1,22 @@ +#ifndef FORMCHECKPOINT_H +#define FORMCHECKPOINT_H + +#include + +namespace Ui { +class FormCheckPoint; +} + +class FormCheckPoint : public QWidget +{ + Q_OBJECT + +public: + explicit FormCheckPoint(QWidget *parent = nullptr); + ~FormCheckPoint(); + +private: + Ui::FormCheckPoint *ui; +}; + +#endif // FORMCHECKPOINT_H diff --git a/softwareDirectory/AutoVerScheme/formcheckpoint.ui b/softwareDirectory/AutoVerScheme/formcheckpoint.ui new file mode 100644 index 0000000..3a6eb47 --- /dev/null +++ b/softwareDirectory/AutoVerScheme/formcheckpoint.ui @@ -0,0 +1,168 @@ + + + FormCheckPoint + + + + 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); + + + + + + + 12 + 75 + true + + + + 检定项目及检定点 + + + + + + + + + + + + + + + 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/formverypoint.cpp b/softwareDirectory/AutoVerScheme/formverypoint.cpp new file mode 100644 index 0000000..d1cec57 --- /dev/null +++ b/softwareDirectory/AutoVerScheme/formverypoint.cpp @@ -0,0 +1,14 @@ +#include "formverypoint.h" +#include "ui_formverypoint.h" + +FormVeryPoint::FormVeryPoint(QWidget *parent) : + QWidget(parent), + ui(new Ui::FormVeryPoint) +{ + ui->setupUi(this); +} + +FormVeryPoint::~FormVeryPoint() +{ + delete ui; +} diff --git a/softwareDirectory/AutoVerScheme/formverypoint.h b/softwareDirectory/AutoVerScheme/formverypoint.h new file mode 100644 index 0000000..bb6555c --- /dev/null +++ b/softwareDirectory/AutoVerScheme/formverypoint.h @@ -0,0 +1,22 @@ +#ifndef FORMVERYPOINT_H +#define FORMVERYPOINT_H + +#include + +namespace Ui { +class FormVeryPoint; +} + +class FormVeryPoint : public QWidget +{ + Q_OBJECT + +public: + explicit FormVeryPoint(QWidget *parent = nullptr); + ~FormVeryPoint(); + +private: + Ui::FormVeryPoint *ui; +}; + +#endif // FORMVERYPOINT_H diff --git a/softwareDirectory/AutoVerScheme/formverypoint.ui b/softwareDirectory/AutoVerScheme/formverypoint.ui new file mode 100644 index 0000000..c7fbf84 --- /dev/null +++ b/softwareDirectory/AutoVerScheme/formverypoint.ui @@ -0,0 +1,168 @@ + + + FormVeryPoint + + + + 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); + + + + + + + 12 + 75 + true + + + + 核查项目及核查点 + + + + + + + + + + + + + + + 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/my_task.cpp b/softwareDirectory/AutoVerScheme/my_task.cpp index 8d7abf7..fb72684 100644 --- a/softwareDirectory/AutoVerScheme/my_task.cpp +++ b/softwareDirectory/AutoVerScheme/my_task.cpp @@ -89,7 +89,7 @@ ui->tableWidget->setItem(row, 5, new QTableWidgetItem(myTask.manufacturer)); //设置数据 ui->tableWidget->setItem(row, 6, new QTableWidgetItem(myTask.customer_name)); //设置数据 ui->tableWidget->setItem(row, 7, new QTableWidgetItem(myTask.FULL_NAME)); //设置数据 - ui->tableWidget->setItem(row, 8, new QTableWidgetItem(myTask.require_over_time)); //设置数据 + ui->tableWidget->setItem(row, 8, new QTableWidgetItem(myTask.require_over_time.toString())); //设置数据 if(myTask.is_urgent=="1") State="是"; else diff --git a/softwareDirectory/AutoVerScheme/newcheckmethod.cpp b/softwareDirectory/AutoVerScheme/newcheckmethod.cpp index 9f0160a..eee7e48 100644 --- a/softwareDirectory/AutoVerScheme/newcheckmethod.cpp +++ b/softwareDirectory/AutoVerScheme/newcheckmethod.cpp @@ -2,6 +2,7 @@ #include "ui_newcheckmethod.h" #include "checkdevice.h" #include "qfiledialog.h" +#include "formcheckpoint.h" NewCheckMethod::NewCheckMethod(QWidget *parent) : QWidget(parent), @@ -40,3 +41,11 @@ { ui->label_11->clear(); } + +void NewCheckMethod::showCheckPoint() +{ + FormCheckPoint *checkWindow = new FormCheckPoint; + //checkWindow.setWindowState(Qt::WindowMaximized); + checkWindow->setWindowModality(Qt::ApplicationModal); + checkWindow->show(); +} diff --git a/softwareDirectory/AutoVerScheme/newcheckmethod.h b/softwareDirectory/AutoVerScheme/newcheckmethod.h index e923401..8a26b0f 100644 --- a/softwareDirectory/AutoVerScheme/newcheckmethod.h +++ b/softwareDirectory/AutoVerScheme/newcheckmethod.h @@ -18,6 +18,7 @@ void showCheckDevice(); void choosePicture(); void deletePicture(); + void showCheckPoint(); private: Ui::NewCheckMethod *ui; diff --git a/softwareDirectory/AutoVerScheme/newcheckmethod.ui b/softwareDirectory/AutoVerScheme/newcheckmethod.ui index 516b62e..27a8951 100644 --- a/softwareDirectory/AutoVerScheme/newcheckmethod.ui +++ b/softwareDirectory/AutoVerScheme/newcheckmethod.ui @@ -567,8 +567,8 @@ showCheckDevice() - 1255 - 221 + 1304 + 257 1333 @@ -583,8 +583,8 @@ choosePicture() - 287 - 184 + 394 + 222 266 @@ -599,8 +599,8 @@ deletePicture() - 375 - 189 + 513 + 222 385 @@ -608,10 +608,27 @@ + + pushButton_8 + clicked() + NewCheckMethod + showCheckPoint() + + + 1280 + 753 + + + 1337 + 716 + + + showCheckDevice() choosePicture() deletePicture() + showCheckPoint() diff --git a/softwareDirectory/AutoVerScheme/AutoVerScheme.pro b/softwareDirectory/AutoVerScheme/AutoVerScheme.pro index b7a7f10..4b3cb2b 100644 --- a/softwareDirectory/AutoVerScheme/AutoVerScheme.pro +++ b/softwareDirectory/AutoVerScheme/AutoVerScheme.pro @@ -31,6 +31,8 @@ depar_task.cpp \ depar_task_server.cpp \ dialogcheckresult.cpp \ + formcheckpoint.cpp \ + formverypoint.cpp \ indexwindow.cpp \ infomanageview.cpp \ inspectdataitem.cpp \ @@ -66,6 +68,8 @@ depar_task.h \ depar_task_server.h \ dialogcheckresult.h \ + formcheckpoint.h \ + formverypoint.h \ indexwindow.h \ infomanageview.h \ inspectdataitem.h \ @@ -94,6 +98,8 @@ datasyncview.ui \ depar_task.ui \ dialogcheckresult.ui \ + formcheckpoint.ui \ + formverypoint.ui \ indexwindow.ui \ infomanageview.ui \ inspectdataitem.ui \ diff --git a/softwareDirectory/AutoVerScheme/AutoVerScheme.pro.user b/softwareDirectory/AutoVerScheme/AutoVerScheme.pro.user index b379c65..c5290fc 100644 --- a/softwareDirectory/AutoVerScheme/AutoVerScheme.pro.user +++ b/softwareDirectory/AutoVerScheme/AutoVerScheme.pro.user @@ -1,10 +1,10 @@ - + EnvironmentId - {94e4c4a1-54d4-412c-b108-da01d63f0d97} + {2746248a-b112-4e0f-9ae0-9e61f2a42309} ProjectExplorer.Project.ActiveTarget @@ -55,23 +55,40 @@ ProjectExplorer.Project.PluginSettings + + true + true + true + true + + 0 + true -fno-delayed-template-parsing true + + true + Builtin.TidyAndClazy + 4 + + + + true + ProjectExplorer.Project.Target.0 - Desktop Qt 5.14.2 MinGW 32-bit - Desktop Qt 5.14.2 MinGW 32-bit - qt.qt5.5142.win32_mingw73_kit + 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:/work/code/BJJZ/svntest/softwareDirectory/build-AutoVerScheme-Desktop_Qt_5_14_2_MinGW_32_bit-Debug + D:/dev/software/softwareDirectory/build-AutoVerScheme-Desktop_Qt_5_14_2_MinGW_64_bit-Debug true @@ -119,7 +136,7 @@ 2 - D:/work/code/BJJZ/svntest/softwareDirectory/build-AutoVerScheme-Desktop_Qt_5_14_2_MinGW_32_bit-Release + D:/dev/software/softwareDirectory/build-AutoVerScheme-Desktop_Qt_5_14_2_MinGW_64_bit-Release true @@ -167,7 +184,7 @@ 0 - D:/work/code/BJJZ/svntest/softwareDirectory/build-AutoVerScheme-Desktop_Qt_5_14_2_MinGW_32_bit-Profile + D:/dev/software/softwareDirectory/build-AutoVerScheme-Desktop_Qt_5_14_2_MinGW_64_bit-Profile true @@ -287,8 +304,8 @@ 2 - Qt4ProjectManager.Qt4RunConfiguration:D:/work/code/BJJZ/svntest/softwareDirectory/AutoVerScheme/AutoVerScheme.pro - D:/work/code/BJJZ/svntest/softwareDirectory/AutoVerScheme/AutoVerScheme.pro + Qt4ProjectManager.Qt4RunConfiguration:D:/dev/software/softwareDirectory/AutoVerScheme/AutoVerScheme.pro + D:/dev/software/softwareDirectory/AutoVerScheme/AutoVerScheme.pro false @@ -299,7 +316,7 @@ false true - D:/work/code/BJJZ/svntest/softwareDirectory/build-AutoVerScheme-Desktop_Qt_5_14_2_MinGW_32_bit-Debug + D:/dev/software/softwareDirectory/build-AutoVerScheme-Desktop_Qt_5_14_2_MinGW_64_bit-Debug 1 @@ -307,14 +324,14 @@ ProjectExplorer.Project.Target.1 - Desktop Qt 5.14.2 MinGW 64-bit - Desktop Qt 5.14.2 MinGW 64-bit - qt.qt5.5142.win64_mingw73_kit + 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:/work/code/BJJZ/svntest/softwareDirectory/build-AutoVerScheme-Desktop_Qt_5_14_2_MinGW_64_bit-Debug + D:/dev/software/softwareDirectory/build-AutoVerScheme-Desktop_Qt_5_14_2_MinGW_32_bit-Debug true @@ -362,7 +379,7 @@ 2 - D:/work/code/BJJZ/svntest/softwareDirectory/build-AutoVerScheme-Desktop_Qt_5_14_2_MinGW_64_bit-Release + D:/dev/software/softwareDirectory/build-AutoVerScheme-Desktop_Qt_5_14_2_MinGW_32_bit-Release true @@ -410,7 +427,7 @@ 0 - D:/work/code/BJJZ/svntest/softwareDirectory/build-AutoVerScheme-Desktop_Qt_5_14_2_MinGW_64_bit-Profile + D:/dev/software/softwareDirectory/build-AutoVerScheme-Desktop_Qt_5_14_2_MinGW_32_bit-Profile true @@ -530,14 +547,14 @@ 2 - - ProjectExplorer.CustomExecutableRunConfiguration - + Qt4ProjectManager.Qt4RunConfiguration:D:/dev/software/softwareDirectory/AutoVerScheme/AutoVerScheme.pro + D:/dev/software/softwareDirectory/AutoVerScheme/AutoVerScheme.pro false false true + true false false true diff --git a/softwareDirectory/AutoVerScheme/AutoVerScheme.pro.user.94e4c4a b/softwareDirectory/AutoVerScheme/AutoVerScheme.pro.user.94e4c4a new file mode 100644 index 0000000..742ac25 --- /dev/null +++ b/softwareDirectory/AutoVerScheme/AutoVerScheme.pro.user.94e4c4a @@ -0,0 +1,562 @@ + + + + + + EnvironmentId + {94e4c4a1-54d4-412c-b108-da01d63f0d97} + + + 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 32-bit + Desktop Qt 5.14.2 MinGW 32-bit + qt.qt5.5142.win32_mingw73_kit + 0 + 0 + 0 + + D:/work/code/BJJZ/svntest/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:/work/code/BJJZ/svntest/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:/work/code/BJJZ/svntest/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:/work/code/BJJZ/svntest/softwareDirectory/AutoVerScheme/AutoVerScheme.pro + D:/work/code/BJJZ/svntest/softwareDirectory/AutoVerScheme/AutoVerScheme.pro + + false + + false + true + true + false + false + true + + D:/work/code/BJJZ/svntest/softwareDirectory/build-AutoVerScheme-Desktop_Qt_5_14_2_MinGW_32_bit-Debug + + 1 + + + + ProjectExplorer.Project.Target.1 + + 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:/work/code/BJJZ/svntest/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:/work/code/BJJZ/svntest/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:/work/code/BJJZ/svntest/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 + + + ProjectExplorer.CustomExecutableRunConfiguration + + + false + + false + true + false + false + true + + + + 1 + + + + ProjectExplorer.Project.TargetCount + 2 + + + ProjectExplorer.Project.Updater.FileVersion + 22 + + + Version + 22 + + diff --git a/softwareDirectory/AutoVerScheme/checkdevice.cpp b/softwareDirectory/AutoVerScheme/checkdevice.cpp index 5497af2..d540aa6 100644 --- a/softwareDirectory/AutoVerScheme/checkdevice.cpp +++ b/softwareDirectory/AutoVerScheme/checkdevice.cpp @@ -14,6 +14,7 @@ ui->tableWidget_4->setColumnWidth(0, 80); for(int i=1;i<5;i++) ui->tableWidget_4->horizontalHeader()->setSectionResizeMode(i,QHeaderView::Stretch); + getCheckDevice(); getStandardDevice(); } @@ -22,6 +23,23 @@ delete ui; } +void CheckDevice::getCheckDevice() +{ + int rowCount=0; + int row=0; + QList data = BaseCommonApi::getTestedDevice(); + for (const TestedDevice& bizDevice : data) { + rowCount = ui->tableWidget_3->rowCount(); + ui->tableWidget_3->insertRow(rowCount); + QCheckBox *checkBox = new QCheckBox; + ui->tableWidget_3->setCellWidget(row, 0, checkBox); + ui->tableWidget_4->setItem(row, 1, new QTableWidgetItem(bizDevice.equipment_name)); + ui->tableWidget_4->setItem(row, 2, new QTableWidgetItem(bizDevice.model)); + ui->tableWidget_4->setItem(row, 3, new QTableWidgetItem(bizDevice.help_instruction)); + row++; + } +} + void CheckDevice::getStandardDevice() { int rowCount=0; diff --git a/softwareDirectory/AutoVerScheme/checkdevice.h b/softwareDirectory/AutoVerScheme/checkdevice.h index fc42d90..8102d24 100644 --- a/softwareDirectory/AutoVerScheme/checkdevice.h +++ b/softwareDirectory/AutoVerScheme/checkdevice.h @@ -16,6 +16,7 @@ ~CheckDevice(); private: + void getCheckDevice(); void getStandardDevice(); private: diff --git a/softwareDirectory/AutoVerScheme/depar_task.cpp b/softwareDirectory/AutoVerScheme/depar_task.cpp index 5b5c3ef..ea7c6a2 100644 --- a/softwareDirectory/AutoVerScheme/depar_task.cpp +++ b/softwareDirectory/AutoVerScheme/depar_task.cpp @@ -97,7 +97,7 @@ ui->tableWidget->setItem(row, 5, new QTableWidgetItem(dept.manufacturer)); //设置数据 ui->tableWidget->setItem(row, 6, new QTableWidgetItem(dept.customer_name)); //设置数据 ui->tableWidget->setItem(row, 7, new QTableWidgetItem(dept.FULL_NAME)); //设置数据 - ui->tableWidget->setItem(row, 8, new QTableWidgetItem(dept.require_over_time)); //设置数据 + ui->tableWidget->setItem(row, 8, new QTableWidgetItem(dept.require_over_time.toString())); //设置数据 if(dept.is_urgent=="1") State="是"; else diff --git a/softwareDirectory/AutoVerScheme/formcheckpoint.cpp b/softwareDirectory/AutoVerScheme/formcheckpoint.cpp new file mode 100644 index 0000000..5ff2d74 --- /dev/null +++ b/softwareDirectory/AutoVerScheme/formcheckpoint.cpp @@ -0,0 +1,14 @@ +#include "formcheckpoint.h" +#include "ui_formcheckpoint.h" + +FormCheckPoint::FormCheckPoint(QWidget *parent) : + QWidget(parent), + ui(new Ui::FormCheckPoint) +{ + ui->setupUi(this); +} + +FormCheckPoint::~FormCheckPoint() +{ + delete ui; +} diff --git a/softwareDirectory/AutoVerScheme/formcheckpoint.h b/softwareDirectory/AutoVerScheme/formcheckpoint.h new file mode 100644 index 0000000..5f8ccf0 --- /dev/null +++ b/softwareDirectory/AutoVerScheme/formcheckpoint.h @@ -0,0 +1,22 @@ +#ifndef FORMCHECKPOINT_H +#define FORMCHECKPOINT_H + +#include + +namespace Ui { +class FormCheckPoint; +} + +class FormCheckPoint : public QWidget +{ + Q_OBJECT + +public: + explicit FormCheckPoint(QWidget *parent = nullptr); + ~FormCheckPoint(); + +private: + Ui::FormCheckPoint *ui; +}; + +#endif // FORMCHECKPOINT_H diff --git a/softwareDirectory/AutoVerScheme/formcheckpoint.ui b/softwareDirectory/AutoVerScheme/formcheckpoint.ui new file mode 100644 index 0000000..3a6eb47 --- /dev/null +++ b/softwareDirectory/AutoVerScheme/formcheckpoint.ui @@ -0,0 +1,168 @@ + + + FormCheckPoint + + + + 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); + + + + + + + 12 + 75 + true + + + + 检定项目及检定点 + + + + + + + + + + + + + + + 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/formverypoint.cpp b/softwareDirectory/AutoVerScheme/formverypoint.cpp new file mode 100644 index 0000000..d1cec57 --- /dev/null +++ b/softwareDirectory/AutoVerScheme/formverypoint.cpp @@ -0,0 +1,14 @@ +#include "formverypoint.h" +#include "ui_formverypoint.h" + +FormVeryPoint::FormVeryPoint(QWidget *parent) : + QWidget(parent), + ui(new Ui::FormVeryPoint) +{ + ui->setupUi(this); +} + +FormVeryPoint::~FormVeryPoint() +{ + delete ui; +} diff --git a/softwareDirectory/AutoVerScheme/formverypoint.h b/softwareDirectory/AutoVerScheme/formverypoint.h new file mode 100644 index 0000000..bb6555c --- /dev/null +++ b/softwareDirectory/AutoVerScheme/formverypoint.h @@ -0,0 +1,22 @@ +#ifndef FORMVERYPOINT_H +#define FORMVERYPOINT_H + +#include + +namespace Ui { +class FormVeryPoint; +} + +class FormVeryPoint : public QWidget +{ + Q_OBJECT + +public: + explicit FormVeryPoint(QWidget *parent = nullptr); + ~FormVeryPoint(); + +private: + Ui::FormVeryPoint *ui; +}; + +#endif // FORMVERYPOINT_H diff --git a/softwareDirectory/AutoVerScheme/formverypoint.ui b/softwareDirectory/AutoVerScheme/formverypoint.ui new file mode 100644 index 0000000..c7fbf84 --- /dev/null +++ b/softwareDirectory/AutoVerScheme/formverypoint.ui @@ -0,0 +1,168 @@ + + + FormVeryPoint + + + + 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); + + + + + + + 12 + 75 + true + + + + 核查项目及核查点 + + + + + + + + + + + + + + + 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/my_task.cpp b/softwareDirectory/AutoVerScheme/my_task.cpp index 8d7abf7..fb72684 100644 --- a/softwareDirectory/AutoVerScheme/my_task.cpp +++ b/softwareDirectory/AutoVerScheme/my_task.cpp @@ -89,7 +89,7 @@ ui->tableWidget->setItem(row, 5, new QTableWidgetItem(myTask.manufacturer)); //设置数据 ui->tableWidget->setItem(row, 6, new QTableWidgetItem(myTask.customer_name)); //设置数据 ui->tableWidget->setItem(row, 7, new QTableWidgetItem(myTask.FULL_NAME)); //设置数据 - ui->tableWidget->setItem(row, 8, new QTableWidgetItem(myTask.require_over_time)); //设置数据 + ui->tableWidget->setItem(row, 8, new QTableWidgetItem(myTask.require_over_time.toString())); //设置数据 if(myTask.is_urgent=="1") State="是"; else diff --git a/softwareDirectory/AutoVerScheme/newcheckmethod.cpp b/softwareDirectory/AutoVerScheme/newcheckmethod.cpp index 9f0160a..eee7e48 100644 --- a/softwareDirectory/AutoVerScheme/newcheckmethod.cpp +++ b/softwareDirectory/AutoVerScheme/newcheckmethod.cpp @@ -2,6 +2,7 @@ #include "ui_newcheckmethod.h" #include "checkdevice.h" #include "qfiledialog.h" +#include "formcheckpoint.h" NewCheckMethod::NewCheckMethod(QWidget *parent) : QWidget(parent), @@ -40,3 +41,11 @@ { ui->label_11->clear(); } + +void NewCheckMethod::showCheckPoint() +{ + FormCheckPoint *checkWindow = new FormCheckPoint; + //checkWindow.setWindowState(Qt::WindowMaximized); + checkWindow->setWindowModality(Qt::ApplicationModal); + checkWindow->show(); +} diff --git a/softwareDirectory/AutoVerScheme/newcheckmethod.h b/softwareDirectory/AutoVerScheme/newcheckmethod.h index e923401..8a26b0f 100644 --- a/softwareDirectory/AutoVerScheme/newcheckmethod.h +++ b/softwareDirectory/AutoVerScheme/newcheckmethod.h @@ -18,6 +18,7 @@ void showCheckDevice(); void choosePicture(); void deletePicture(); + void showCheckPoint(); private: Ui::NewCheckMethod *ui; diff --git a/softwareDirectory/AutoVerScheme/newcheckmethod.ui b/softwareDirectory/AutoVerScheme/newcheckmethod.ui index 516b62e..27a8951 100644 --- a/softwareDirectory/AutoVerScheme/newcheckmethod.ui +++ b/softwareDirectory/AutoVerScheme/newcheckmethod.ui @@ -567,8 +567,8 @@ showCheckDevice() - 1255 - 221 + 1304 + 257 1333 @@ -583,8 +583,8 @@ choosePicture() - 287 - 184 + 394 + 222 266 @@ -599,8 +599,8 @@ deletePicture() - 375 - 189 + 513 + 222 385 @@ -608,10 +608,27 @@ + + pushButton_8 + clicked() + NewCheckMethod + showCheckPoint() + + + 1280 + 753 + + + 1337 + 716 + + + showCheckDevice() choosePicture() deletePicture() + showCheckPoint() diff --git a/softwareDirectory/AutoVerScheme/newverifymethod.cpp b/softwareDirectory/AutoVerScheme/newverifymethod.cpp index e07a035..d3d5abd 100644 --- a/softwareDirectory/AutoVerScheme/newverifymethod.cpp +++ b/softwareDirectory/AutoVerScheme/newverifymethod.cpp @@ -1,6 +1,7 @@ #include "newverifymethod.h" #include "ui_newverifymethod.h" #include "verifydevice.h" +#include "formverypoint.h" NewVerifyMethod::NewVerifyMethod(QWidget *parent) : QWidget(parent), @@ -21,3 +22,11 @@ checkWindow->setWindowModality(Qt::ApplicationModal); checkWindow->show(); } + +void NewVerifyMethod::showVeryPoint() +{ + FormVeryPoint *checkWindow = new FormVeryPoint; + //checkWindow.setWindowState(Qt::WindowMaximized); + checkWindow->setWindowModality(Qt::ApplicationModal); + checkWindow->show(); +} diff --git a/softwareDirectory/AutoVerScheme/AutoVerScheme.pro b/softwareDirectory/AutoVerScheme/AutoVerScheme.pro index b7a7f10..4b3cb2b 100644 --- a/softwareDirectory/AutoVerScheme/AutoVerScheme.pro +++ b/softwareDirectory/AutoVerScheme/AutoVerScheme.pro @@ -31,6 +31,8 @@ depar_task.cpp \ depar_task_server.cpp \ dialogcheckresult.cpp \ + formcheckpoint.cpp \ + formverypoint.cpp \ indexwindow.cpp \ infomanageview.cpp \ inspectdataitem.cpp \ @@ -66,6 +68,8 @@ depar_task.h \ depar_task_server.h \ dialogcheckresult.h \ + formcheckpoint.h \ + formverypoint.h \ indexwindow.h \ infomanageview.h \ inspectdataitem.h \ @@ -94,6 +98,8 @@ datasyncview.ui \ depar_task.ui \ dialogcheckresult.ui \ + formcheckpoint.ui \ + formverypoint.ui \ indexwindow.ui \ infomanageview.ui \ inspectdataitem.ui \ diff --git a/softwareDirectory/AutoVerScheme/AutoVerScheme.pro.user b/softwareDirectory/AutoVerScheme/AutoVerScheme.pro.user index b379c65..c5290fc 100644 --- a/softwareDirectory/AutoVerScheme/AutoVerScheme.pro.user +++ b/softwareDirectory/AutoVerScheme/AutoVerScheme.pro.user @@ -1,10 +1,10 @@ - + EnvironmentId - {94e4c4a1-54d4-412c-b108-da01d63f0d97} + {2746248a-b112-4e0f-9ae0-9e61f2a42309} ProjectExplorer.Project.ActiveTarget @@ -55,23 +55,40 @@ ProjectExplorer.Project.PluginSettings + + true + true + true + true + + 0 + true -fno-delayed-template-parsing true + + true + Builtin.TidyAndClazy + 4 + + + + true + ProjectExplorer.Project.Target.0 - Desktop Qt 5.14.2 MinGW 32-bit - Desktop Qt 5.14.2 MinGW 32-bit - qt.qt5.5142.win32_mingw73_kit + 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:/work/code/BJJZ/svntest/softwareDirectory/build-AutoVerScheme-Desktop_Qt_5_14_2_MinGW_32_bit-Debug + D:/dev/software/softwareDirectory/build-AutoVerScheme-Desktop_Qt_5_14_2_MinGW_64_bit-Debug true @@ -119,7 +136,7 @@ 2 - D:/work/code/BJJZ/svntest/softwareDirectory/build-AutoVerScheme-Desktop_Qt_5_14_2_MinGW_32_bit-Release + D:/dev/software/softwareDirectory/build-AutoVerScheme-Desktop_Qt_5_14_2_MinGW_64_bit-Release true @@ -167,7 +184,7 @@ 0 - D:/work/code/BJJZ/svntest/softwareDirectory/build-AutoVerScheme-Desktop_Qt_5_14_2_MinGW_32_bit-Profile + D:/dev/software/softwareDirectory/build-AutoVerScheme-Desktop_Qt_5_14_2_MinGW_64_bit-Profile true @@ -287,8 +304,8 @@ 2 - Qt4ProjectManager.Qt4RunConfiguration:D:/work/code/BJJZ/svntest/softwareDirectory/AutoVerScheme/AutoVerScheme.pro - D:/work/code/BJJZ/svntest/softwareDirectory/AutoVerScheme/AutoVerScheme.pro + Qt4ProjectManager.Qt4RunConfiguration:D:/dev/software/softwareDirectory/AutoVerScheme/AutoVerScheme.pro + D:/dev/software/softwareDirectory/AutoVerScheme/AutoVerScheme.pro false @@ -299,7 +316,7 @@ false true - D:/work/code/BJJZ/svntest/softwareDirectory/build-AutoVerScheme-Desktop_Qt_5_14_2_MinGW_32_bit-Debug + D:/dev/software/softwareDirectory/build-AutoVerScheme-Desktop_Qt_5_14_2_MinGW_64_bit-Debug 1 @@ -307,14 +324,14 @@ ProjectExplorer.Project.Target.1 - Desktop Qt 5.14.2 MinGW 64-bit - Desktop Qt 5.14.2 MinGW 64-bit - qt.qt5.5142.win64_mingw73_kit + 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:/work/code/BJJZ/svntest/softwareDirectory/build-AutoVerScheme-Desktop_Qt_5_14_2_MinGW_64_bit-Debug + D:/dev/software/softwareDirectory/build-AutoVerScheme-Desktop_Qt_5_14_2_MinGW_32_bit-Debug true @@ -362,7 +379,7 @@ 2 - D:/work/code/BJJZ/svntest/softwareDirectory/build-AutoVerScheme-Desktop_Qt_5_14_2_MinGW_64_bit-Release + D:/dev/software/softwareDirectory/build-AutoVerScheme-Desktop_Qt_5_14_2_MinGW_32_bit-Release true @@ -410,7 +427,7 @@ 0 - D:/work/code/BJJZ/svntest/softwareDirectory/build-AutoVerScheme-Desktop_Qt_5_14_2_MinGW_64_bit-Profile + D:/dev/software/softwareDirectory/build-AutoVerScheme-Desktop_Qt_5_14_2_MinGW_32_bit-Profile true @@ -530,14 +547,14 @@ 2 - - ProjectExplorer.CustomExecutableRunConfiguration - + Qt4ProjectManager.Qt4RunConfiguration:D:/dev/software/softwareDirectory/AutoVerScheme/AutoVerScheme.pro + D:/dev/software/softwareDirectory/AutoVerScheme/AutoVerScheme.pro false false true + true false false true diff --git a/softwareDirectory/AutoVerScheme/AutoVerScheme.pro.user.94e4c4a b/softwareDirectory/AutoVerScheme/AutoVerScheme.pro.user.94e4c4a new file mode 100644 index 0000000..742ac25 --- /dev/null +++ b/softwareDirectory/AutoVerScheme/AutoVerScheme.pro.user.94e4c4a @@ -0,0 +1,562 @@ + + + + + + EnvironmentId + {94e4c4a1-54d4-412c-b108-da01d63f0d97} + + + 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 32-bit + Desktop Qt 5.14.2 MinGW 32-bit + qt.qt5.5142.win32_mingw73_kit + 0 + 0 + 0 + + D:/work/code/BJJZ/svntest/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:/work/code/BJJZ/svntest/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:/work/code/BJJZ/svntest/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:/work/code/BJJZ/svntest/softwareDirectory/AutoVerScheme/AutoVerScheme.pro + D:/work/code/BJJZ/svntest/softwareDirectory/AutoVerScheme/AutoVerScheme.pro + + false + + false + true + true + false + false + true + + D:/work/code/BJJZ/svntest/softwareDirectory/build-AutoVerScheme-Desktop_Qt_5_14_2_MinGW_32_bit-Debug + + 1 + + + + ProjectExplorer.Project.Target.1 + + 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:/work/code/BJJZ/svntest/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:/work/code/BJJZ/svntest/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:/work/code/BJJZ/svntest/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 + + + ProjectExplorer.CustomExecutableRunConfiguration + + + false + + false + true + false + false + true + + + + 1 + + + + ProjectExplorer.Project.TargetCount + 2 + + + ProjectExplorer.Project.Updater.FileVersion + 22 + + + Version + 22 + + diff --git a/softwareDirectory/AutoVerScheme/checkdevice.cpp b/softwareDirectory/AutoVerScheme/checkdevice.cpp index 5497af2..d540aa6 100644 --- a/softwareDirectory/AutoVerScheme/checkdevice.cpp +++ b/softwareDirectory/AutoVerScheme/checkdevice.cpp @@ -14,6 +14,7 @@ ui->tableWidget_4->setColumnWidth(0, 80); for(int i=1;i<5;i++) ui->tableWidget_4->horizontalHeader()->setSectionResizeMode(i,QHeaderView::Stretch); + getCheckDevice(); getStandardDevice(); } @@ -22,6 +23,23 @@ delete ui; } +void CheckDevice::getCheckDevice() +{ + int rowCount=0; + int row=0; + QList data = BaseCommonApi::getTestedDevice(); + for (const TestedDevice& bizDevice : data) { + rowCount = ui->tableWidget_3->rowCount(); + ui->tableWidget_3->insertRow(rowCount); + QCheckBox *checkBox = new QCheckBox; + ui->tableWidget_3->setCellWidget(row, 0, checkBox); + ui->tableWidget_4->setItem(row, 1, new QTableWidgetItem(bizDevice.equipment_name)); + ui->tableWidget_4->setItem(row, 2, new QTableWidgetItem(bizDevice.model)); + ui->tableWidget_4->setItem(row, 3, new QTableWidgetItem(bizDevice.help_instruction)); + row++; + } +} + void CheckDevice::getStandardDevice() { int rowCount=0; diff --git a/softwareDirectory/AutoVerScheme/checkdevice.h b/softwareDirectory/AutoVerScheme/checkdevice.h index fc42d90..8102d24 100644 --- a/softwareDirectory/AutoVerScheme/checkdevice.h +++ b/softwareDirectory/AutoVerScheme/checkdevice.h @@ -16,6 +16,7 @@ ~CheckDevice(); private: + void getCheckDevice(); void getStandardDevice(); private: diff --git a/softwareDirectory/AutoVerScheme/depar_task.cpp b/softwareDirectory/AutoVerScheme/depar_task.cpp index 5b5c3ef..ea7c6a2 100644 --- a/softwareDirectory/AutoVerScheme/depar_task.cpp +++ b/softwareDirectory/AutoVerScheme/depar_task.cpp @@ -97,7 +97,7 @@ ui->tableWidget->setItem(row, 5, new QTableWidgetItem(dept.manufacturer)); //设置数据 ui->tableWidget->setItem(row, 6, new QTableWidgetItem(dept.customer_name)); //设置数据 ui->tableWidget->setItem(row, 7, new QTableWidgetItem(dept.FULL_NAME)); //设置数据 - ui->tableWidget->setItem(row, 8, new QTableWidgetItem(dept.require_over_time)); //设置数据 + ui->tableWidget->setItem(row, 8, new QTableWidgetItem(dept.require_over_time.toString())); //设置数据 if(dept.is_urgent=="1") State="是"; else diff --git a/softwareDirectory/AutoVerScheme/formcheckpoint.cpp b/softwareDirectory/AutoVerScheme/formcheckpoint.cpp new file mode 100644 index 0000000..5ff2d74 --- /dev/null +++ b/softwareDirectory/AutoVerScheme/formcheckpoint.cpp @@ -0,0 +1,14 @@ +#include "formcheckpoint.h" +#include "ui_formcheckpoint.h" + +FormCheckPoint::FormCheckPoint(QWidget *parent) : + QWidget(parent), + ui(new Ui::FormCheckPoint) +{ + ui->setupUi(this); +} + +FormCheckPoint::~FormCheckPoint() +{ + delete ui; +} diff --git a/softwareDirectory/AutoVerScheme/formcheckpoint.h b/softwareDirectory/AutoVerScheme/formcheckpoint.h new file mode 100644 index 0000000..5f8ccf0 --- /dev/null +++ b/softwareDirectory/AutoVerScheme/formcheckpoint.h @@ -0,0 +1,22 @@ +#ifndef FORMCHECKPOINT_H +#define FORMCHECKPOINT_H + +#include + +namespace Ui { +class FormCheckPoint; +} + +class FormCheckPoint : public QWidget +{ + Q_OBJECT + +public: + explicit FormCheckPoint(QWidget *parent = nullptr); + ~FormCheckPoint(); + +private: + Ui::FormCheckPoint *ui; +}; + +#endif // FORMCHECKPOINT_H diff --git a/softwareDirectory/AutoVerScheme/formcheckpoint.ui b/softwareDirectory/AutoVerScheme/formcheckpoint.ui new file mode 100644 index 0000000..3a6eb47 --- /dev/null +++ b/softwareDirectory/AutoVerScheme/formcheckpoint.ui @@ -0,0 +1,168 @@ + + + FormCheckPoint + + + + 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); + + + + + + + 12 + 75 + true + + + + 检定项目及检定点 + + + + + + + + + + + + + + + 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/formverypoint.cpp b/softwareDirectory/AutoVerScheme/formverypoint.cpp new file mode 100644 index 0000000..d1cec57 --- /dev/null +++ b/softwareDirectory/AutoVerScheme/formverypoint.cpp @@ -0,0 +1,14 @@ +#include "formverypoint.h" +#include "ui_formverypoint.h" + +FormVeryPoint::FormVeryPoint(QWidget *parent) : + QWidget(parent), + ui(new Ui::FormVeryPoint) +{ + ui->setupUi(this); +} + +FormVeryPoint::~FormVeryPoint() +{ + delete ui; +} diff --git a/softwareDirectory/AutoVerScheme/formverypoint.h b/softwareDirectory/AutoVerScheme/formverypoint.h new file mode 100644 index 0000000..bb6555c --- /dev/null +++ b/softwareDirectory/AutoVerScheme/formverypoint.h @@ -0,0 +1,22 @@ +#ifndef FORMVERYPOINT_H +#define FORMVERYPOINT_H + +#include + +namespace Ui { +class FormVeryPoint; +} + +class FormVeryPoint : public QWidget +{ + Q_OBJECT + +public: + explicit FormVeryPoint(QWidget *parent = nullptr); + ~FormVeryPoint(); + +private: + Ui::FormVeryPoint *ui; +}; + +#endif // FORMVERYPOINT_H diff --git a/softwareDirectory/AutoVerScheme/formverypoint.ui b/softwareDirectory/AutoVerScheme/formverypoint.ui new file mode 100644 index 0000000..c7fbf84 --- /dev/null +++ b/softwareDirectory/AutoVerScheme/formverypoint.ui @@ -0,0 +1,168 @@ + + + FormVeryPoint + + + + 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); + + + + + + + 12 + 75 + true + + + + 核查项目及核查点 + + + + + + + + + + + + + + + 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/my_task.cpp b/softwareDirectory/AutoVerScheme/my_task.cpp index 8d7abf7..fb72684 100644 --- a/softwareDirectory/AutoVerScheme/my_task.cpp +++ b/softwareDirectory/AutoVerScheme/my_task.cpp @@ -89,7 +89,7 @@ ui->tableWidget->setItem(row, 5, new QTableWidgetItem(myTask.manufacturer)); //设置数据 ui->tableWidget->setItem(row, 6, new QTableWidgetItem(myTask.customer_name)); //设置数据 ui->tableWidget->setItem(row, 7, new QTableWidgetItem(myTask.FULL_NAME)); //设置数据 - ui->tableWidget->setItem(row, 8, new QTableWidgetItem(myTask.require_over_time)); //设置数据 + ui->tableWidget->setItem(row, 8, new QTableWidgetItem(myTask.require_over_time.toString())); //设置数据 if(myTask.is_urgent=="1") State="是"; else diff --git a/softwareDirectory/AutoVerScheme/newcheckmethod.cpp b/softwareDirectory/AutoVerScheme/newcheckmethod.cpp index 9f0160a..eee7e48 100644 --- a/softwareDirectory/AutoVerScheme/newcheckmethod.cpp +++ b/softwareDirectory/AutoVerScheme/newcheckmethod.cpp @@ -2,6 +2,7 @@ #include "ui_newcheckmethod.h" #include "checkdevice.h" #include "qfiledialog.h" +#include "formcheckpoint.h" NewCheckMethod::NewCheckMethod(QWidget *parent) : QWidget(parent), @@ -40,3 +41,11 @@ { ui->label_11->clear(); } + +void NewCheckMethod::showCheckPoint() +{ + FormCheckPoint *checkWindow = new FormCheckPoint; + //checkWindow.setWindowState(Qt::WindowMaximized); + checkWindow->setWindowModality(Qt::ApplicationModal); + checkWindow->show(); +} diff --git a/softwareDirectory/AutoVerScheme/newcheckmethod.h b/softwareDirectory/AutoVerScheme/newcheckmethod.h index e923401..8a26b0f 100644 --- a/softwareDirectory/AutoVerScheme/newcheckmethod.h +++ b/softwareDirectory/AutoVerScheme/newcheckmethod.h @@ -18,6 +18,7 @@ void showCheckDevice(); void choosePicture(); void deletePicture(); + void showCheckPoint(); private: Ui::NewCheckMethod *ui; diff --git a/softwareDirectory/AutoVerScheme/newcheckmethod.ui b/softwareDirectory/AutoVerScheme/newcheckmethod.ui index 516b62e..27a8951 100644 --- a/softwareDirectory/AutoVerScheme/newcheckmethod.ui +++ b/softwareDirectory/AutoVerScheme/newcheckmethod.ui @@ -567,8 +567,8 @@ showCheckDevice() - 1255 - 221 + 1304 + 257 1333 @@ -583,8 +583,8 @@ choosePicture() - 287 - 184 + 394 + 222 266 @@ -599,8 +599,8 @@ deletePicture() - 375 - 189 + 513 + 222 385 @@ -608,10 +608,27 @@ + + pushButton_8 + clicked() + NewCheckMethod + showCheckPoint() + + + 1280 + 753 + + + 1337 + 716 + + + showCheckDevice() choosePicture() deletePicture() + showCheckPoint() diff --git a/softwareDirectory/AutoVerScheme/newverifymethod.cpp b/softwareDirectory/AutoVerScheme/newverifymethod.cpp index e07a035..d3d5abd 100644 --- a/softwareDirectory/AutoVerScheme/newverifymethod.cpp +++ b/softwareDirectory/AutoVerScheme/newverifymethod.cpp @@ -1,6 +1,7 @@ #include "newverifymethod.h" #include "ui_newverifymethod.h" #include "verifydevice.h" +#include "formverypoint.h" NewVerifyMethod::NewVerifyMethod(QWidget *parent) : QWidget(parent), @@ -21,3 +22,11 @@ checkWindow->setWindowModality(Qt::ApplicationModal); checkWindow->show(); } + +void NewVerifyMethod::showVeryPoint() +{ + FormVeryPoint *checkWindow = new FormVeryPoint; + //checkWindow.setWindowState(Qt::WindowMaximized); + checkWindow->setWindowModality(Qt::ApplicationModal); + checkWindow->show(); +} diff --git a/softwareDirectory/AutoVerScheme/newverifymethod.h b/softwareDirectory/AutoVerScheme/newverifymethod.h index 46caeb4..1c262c0 100644 --- a/softwareDirectory/AutoVerScheme/newverifymethod.h +++ b/softwareDirectory/AutoVerScheme/newverifymethod.h @@ -16,6 +16,7 @@ ~NewVerifyMethod(); private slots: void showVerifyDevice(); + void showVeryPoint(); private: Ui::NewVerifyMethod *ui; }; diff --git a/softwareDirectory/AutoVerScheme/AutoVerScheme.pro b/softwareDirectory/AutoVerScheme/AutoVerScheme.pro index b7a7f10..4b3cb2b 100644 --- a/softwareDirectory/AutoVerScheme/AutoVerScheme.pro +++ b/softwareDirectory/AutoVerScheme/AutoVerScheme.pro @@ -31,6 +31,8 @@ depar_task.cpp \ depar_task_server.cpp \ dialogcheckresult.cpp \ + formcheckpoint.cpp \ + formverypoint.cpp \ indexwindow.cpp \ infomanageview.cpp \ inspectdataitem.cpp \ @@ -66,6 +68,8 @@ depar_task.h \ depar_task_server.h \ dialogcheckresult.h \ + formcheckpoint.h \ + formverypoint.h \ indexwindow.h \ infomanageview.h \ inspectdataitem.h \ @@ -94,6 +98,8 @@ datasyncview.ui \ depar_task.ui \ dialogcheckresult.ui \ + formcheckpoint.ui \ + formverypoint.ui \ indexwindow.ui \ infomanageview.ui \ inspectdataitem.ui \ diff --git a/softwareDirectory/AutoVerScheme/AutoVerScheme.pro.user b/softwareDirectory/AutoVerScheme/AutoVerScheme.pro.user index b379c65..c5290fc 100644 --- a/softwareDirectory/AutoVerScheme/AutoVerScheme.pro.user +++ b/softwareDirectory/AutoVerScheme/AutoVerScheme.pro.user @@ -1,10 +1,10 @@ - + EnvironmentId - {94e4c4a1-54d4-412c-b108-da01d63f0d97} + {2746248a-b112-4e0f-9ae0-9e61f2a42309} ProjectExplorer.Project.ActiveTarget @@ -55,23 +55,40 @@ ProjectExplorer.Project.PluginSettings + + true + true + true + true + + 0 + true -fno-delayed-template-parsing true + + true + Builtin.TidyAndClazy + 4 + + + + true + ProjectExplorer.Project.Target.0 - Desktop Qt 5.14.2 MinGW 32-bit - Desktop Qt 5.14.2 MinGW 32-bit - qt.qt5.5142.win32_mingw73_kit + 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:/work/code/BJJZ/svntest/softwareDirectory/build-AutoVerScheme-Desktop_Qt_5_14_2_MinGW_32_bit-Debug + D:/dev/software/softwareDirectory/build-AutoVerScheme-Desktop_Qt_5_14_2_MinGW_64_bit-Debug true @@ -119,7 +136,7 @@ 2 - D:/work/code/BJJZ/svntest/softwareDirectory/build-AutoVerScheme-Desktop_Qt_5_14_2_MinGW_32_bit-Release + D:/dev/software/softwareDirectory/build-AutoVerScheme-Desktop_Qt_5_14_2_MinGW_64_bit-Release true @@ -167,7 +184,7 @@ 0 - D:/work/code/BJJZ/svntest/softwareDirectory/build-AutoVerScheme-Desktop_Qt_5_14_2_MinGW_32_bit-Profile + D:/dev/software/softwareDirectory/build-AutoVerScheme-Desktop_Qt_5_14_2_MinGW_64_bit-Profile true @@ -287,8 +304,8 @@ 2 - Qt4ProjectManager.Qt4RunConfiguration:D:/work/code/BJJZ/svntest/softwareDirectory/AutoVerScheme/AutoVerScheme.pro - D:/work/code/BJJZ/svntest/softwareDirectory/AutoVerScheme/AutoVerScheme.pro + Qt4ProjectManager.Qt4RunConfiguration:D:/dev/software/softwareDirectory/AutoVerScheme/AutoVerScheme.pro + D:/dev/software/softwareDirectory/AutoVerScheme/AutoVerScheme.pro false @@ -299,7 +316,7 @@ false true - D:/work/code/BJJZ/svntest/softwareDirectory/build-AutoVerScheme-Desktop_Qt_5_14_2_MinGW_32_bit-Debug + D:/dev/software/softwareDirectory/build-AutoVerScheme-Desktop_Qt_5_14_2_MinGW_64_bit-Debug 1 @@ -307,14 +324,14 @@ ProjectExplorer.Project.Target.1 - Desktop Qt 5.14.2 MinGW 64-bit - Desktop Qt 5.14.2 MinGW 64-bit - qt.qt5.5142.win64_mingw73_kit + 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:/work/code/BJJZ/svntest/softwareDirectory/build-AutoVerScheme-Desktop_Qt_5_14_2_MinGW_64_bit-Debug + D:/dev/software/softwareDirectory/build-AutoVerScheme-Desktop_Qt_5_14_2_MinGW_32_bit-Debug true @@ -362,7 +379,7 @@ 2 - D:/work/code/BJJZ/svntest/softwareDirectory/build-AutoVerScheme-Desktop_Qt_5_14_2_MinGW_64_bit-Release + D:/dev/software/softwareDirectory/build-AutoVerScheme-Desktop_Qt_5_14_2_MinGW_32_bit-Release true @@ -410,7 +427,7 @@ 0 - D:/work/code/BJJZ/svntest/softwareDirectory/build-AutoVerScheme-Desktop_Qt_5_14_2_MinGW_64_bit-Profile + D:/dev/software/softwareDirectory/build-AutoVerScheme-Desktop_Qt_5_14_2_MinGW_32_bit-Profile true @@ -530,14 +547,14 @@ 2 - - ProjectExplorer.CustomExecutableRunConfiguration - + Qt4ProjectManager.Qt4RunConfiguration:D:/dev/software/softwareDirectory/AutoVerScheme/AutoVerScheme.pro + D:/dev/software/softwareDirectory/AutoVerScheme/AutoVerScheme.pro false false true + true false false true diff --git a/softwareDirectory/AutoVerScheme/AutoVerScheme.pro.user.94e4c4a b/softwareDirectory/AutoVerScheme/AutoVerScheme.pro.user.94e4c4a new file mode 100644 index 0000000..742ac25 --- /dev/null +++ b/softwareDirectory/AutoVerScheme/AutoVerScheme.pro.user.94e4c4a @@ -0,0 +1,562 @@ + + + + + + EnvironmentId + {94e4c4a1-54d4-412c-b108-da01d63f0d97} + + + 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 32-bit + Desktop Qt 5.14.2 MinGW 32-bit + qt.qt5.5142.win32_mingw73_kit + 0 + 0 + 0 + + D:/work/code/BJJZ/svntest/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:/work/code/BJJZ/svntest/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:/work/code/BJJZ/svntest/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:/work/code/BJJZ/svntest/softwareDirectory/AutoVerScheme/AutoVerScheme.pro + D:/work/code/BJJZ/svntest/softwareDirectory/AutoVerScheme/AutoVerScheme.pro + + false + + false + true + true + false + false + true + + D:/work/code/BJJZ/svntest/softwareDirectory/build-AutoVerScheme-Desktop_Qt_5_14_2_MinGW_32_bit-Debug + + 1 + + + + ProjectExplorer.Project.Target.1 + + 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:/work/code/BJJZ/svntest/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:/work/code/BJJZ/svntest/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:/work/code/BJJZ/svntest/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 + + + ProjectExplorer.CustomExecutableRunConfiguration + + + false + + false + true + false + false + true + + + + 1 + + + + ProjectExplorer.Project.TargetCount + 2 + + + ProjectExplorer.Project.Updater.FileVersion + 22 + + + Version + 22 + + diff --git a/softwareDirectory/AutoVerScheme/checkdevice.cpp b/softwareDirectory/AutoVerScheme/checkdevice.cpp index 5497af2..d540aa6 100644 --- a/softwareDirectory/AutoVerScheme/checkdevice.cpp +++ b/softwareDirectory/AutoVerScheme/checkdevice.cpp @@ -14,6 +14,7 @@ ui->tableWidget_4->setColumnWidth(0, 80); for(int i=1;i<5;i++) ui->tableWidget_4->horizontalHeader()->setSectionResizeMode(i,QHeaderView::Stretch); + getCheckDevice(); getStandardDevice(); } @@ -22,6 +23,23 @@ delete ui; } +void CheckDevice::getCheckDevice() +{ + int rowCount=0; + int row=0; + QList data = BaseCommonApi::getTestedDevice(); + for (const TestedDevice& bizDevice : data) { + rowCount = ui->tableWidget_3->rowCount(); + ui->tableWidget_3->insertRow(rowCount); + QCheckBox *checkBox = new QCheckBox; + ui->tableWidget_3->setCellWidget(row, 0, checkBox); + ui->tableWidget_4->setItem(row, 1, new QTableWidgetItem(bizDevice.equipment_name)); + ui->tableWidget_4->setItem(row, 2, new QTableWidgetItem(bizDevice.model)); + ui->tableWidget_4->setItem(row, 3, new QTableWidgetItem(bizDevice.help_instruction)); + row++; + } +} + void CheckDevice::getStandardDevice() { int rowCount=0; diff --git a/softwareDirectory/AutoVerScheme/checkdevice.h b/softwareDirectory/AutoVerScheme/checkdevice.h index fc42d90..8102d24 100644 --- a/softwareDirectory/AutoVerScheme/checkdevice.h +++ b/softwareDirectory/AutoVerScheme/checkdevice.h @@ -16,6 +16,7 @@ ~CheckDevice(); private: + void getCheckDevice(); void getStandardDevice(); private: diff --git a/softwareDirectory/AutoVerScheme/depar_task.cpp b/softwareDirectory/AutoVerScheme/depar_task.cpp index 5b5c3ef..ea7c6a2 100644 --- a/softwareDirectory/AutoVerScheme/depar_task.cpp +++ b/softwareDirectory/AutoVerScheme/depar_task.cpp @@ -97,7 +97,7 @@ ui->tableWidget->setItem(row, 5, new QTableWidgetItem(dept.manufacturer)); //设置数据 ui->tableWidget->setItem(row, 6, new QTableWidgetItem(dept.customer_name)); //设置数据 ui->tableWidget->setItem(row, 7, new QTableWidgetItem(dept.FULL_NAME)); //设置数据 - ui->tableWidget->setItem(row, 8, new QTableWidgetItem(dept.require_over_time)); //设置数据 + ui->tableWidget->setItem(row, 8, new QTableWidgetItem(dept.require_over_time.toString())); //设置数据 if(dept.is_urgent=="1") State="是"; else diff --git a/softwareDirectory/AutoVerScheme/formcheckpoint.cpp b/softwareDirectory/AutoVerScheme/formcheckpoint.cpp new file mode 100644 index 0000000..5ff2d74 --- /dev/null +++ b/softwareDirectory/AutoVerScheme/formcheckpoint.cpp @@ -0,0 +1,14 @@ +#include "formcheckpoint.h" +#include "ui_formcheckpoint.h" + +FormCheckPoint::FormCheckPoint(QWidget *parent) : + QWidget(parent), + ui(new Ui::FormCheckPoint) +{ + ui->setupUi(this); +} + +FormCheckPoint::~FormCheckPoint() +{ + delete ui; +} diff --git a/softwareDirectory/AutoVerScheme/formcheckpoint.h b/softwareDirectory/AutoVerScheme/formcheckpoint.h new file mode 100644 index 0000000..5f8ccf0 --- /dev/null +++ b/softwareDirectory/AutoVerScheme/formcheckpoint.h @@ -0,0 +1,22 @@ +#ifndef FORMCHECKPOINT_H +#define FORMCHECKPOINT_H + +#include + +namespace Ui { +class FormCheckPoint; +} + +class FormCheckPoint : public QWidget +{ + Q_OBJECT + +public: + explicit FormCheckPoint(QWidget *parent = nullptr); + ~FormCheckPoint(); + +private: + Ui::FormCheckPoint *ui; +}; + +#endif // FORMCHECKPOINT_H diff --git a/softwareDirectory/AutoVerScheme/formcheckpoint.ui b/softwareDirectory/AutoVerScheme/formcheckpoint.ui new file mode 100644 index 0000000..3a6eb47 --- /dev/null +++ b/softwareDirectory/AutoVerScheme/formcheckpoint.ui @@ -0,0 +1,168 @@ + + + FormCheckPoint + + + + 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); + + + + + + + 12 + 75 + true + + + + 检定项目及检定点 + + + + + + + + + + + + + + + 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/formverypoint.cpp b/softwareDirectory/AutoVerScheme/formverypoint.cpp new file mode 100644 index 0000000..d1cec57 --- /dev/null +++ b/softwareDirectory/AutoVerScheme/formverypoint.cpp @@ -0,0 +1,14 @@ +#include "formverypoint.h" +#include "ui_formverypoint.h" + +FormVeryPoint::FormVeryPoint(QWidget *parent) : + QWidget(parent), + ui(new Ui::FormVeryPoint) +{ + ui->setupUi(this); +} + +FormVeryPoint::~FormVeryPoint() +{ + delete ui; +} diff --git a/softwareDirectory/AutoVerScheme/formverypoint.h b/softwareDirectory/AutoVerScheme/formverypoint.h new file mode 100644 index 0000000..bb6555c --- /dev/null +++ b/softwareDirectory/AutoVerScheme/formverypoint.h @@ -0,0 +1,22 @@ +#ifndef FORMVERYPOINT_H +#define FORMVERYPOINT_H + +#include + +namespace Ui { +class FormVeryPoint; +} + +class FormVeryPoint : public QWidget +{ + Q_OBJECT + +public: + explicit FormVeryPoint(QWidget *parent = nullptr); + ~FormVeryPoint(); + +private: + Ui::FormVeryPoint *ui; +}; + +#endif // FORMVERYPOINT_H diff --git a/softwareDirectory/AutoVerScheme/formverypoint.ui b/softwareDirectory/AutoVerScheme/formverypoint.ui new file mode 100644 index 0000000..c7fbf84 --- /dev/null +++ b/softwareDirectory/AutoVerScheme/formverypoint.ui @@ -0,0 +1,168 @@ + + + FormVeryPoint + + + + 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); + + + + + + + 12 + 75 + true + + + + 核查项目及核查点 + + + + + + + + + + + + + + + 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/my_task.cpp b/softwareDirectory/AutoVerScheme/my_task.cpp index 8d7abf7..fb72684 100644 --- a/softwareDirectory/AutoVerScheme/my_task.cpp +++ b/softwareDirectory/AutoVerScheme/my_task.cpp @@ -89,7 +89,7 @@ ui->tableWidget->setItem(row, 5, new QTableWidgetItem(myTask.manufacturer)); //设置数据 ui->tableWidget->setItem(row, 6, new QTableWidgetItem(myTask.customer_name)); //设置数据 ui->tableWidget->setItem(row, 7, new QTableWidgetItem(myTask.FULL_NAME)); //设置数据 - ui->tableWidget->setItem(row, 8, new QTableWidgetItem(myTask.require_over_time)); //设置数据 + ui->tableWidget->setItem(row, 8, new QTableWidgetItem(myTask.require_over_time.toString())); //设置数据 if(myTask.is_urgent=="1") State="是"; else diff --git a/softwareDirectory/AutoVerScheme/newcheckmethod.cpp b/softwareDirectory/AutoVerScheme/newcheckmethod.cpp index 9f0160a..eee7e48 100644 --- a/softwareDirectory/AutoVerScheme/newcheckmethod.cpp +++ b/softwareDirectory/AutoVerScheme/newcheckmethod.cpp @@ -2,6 +2,7 @@ #include "ui_newcheckmethod.h" #include "checkdevice.h" #include "qfiledialog.h" +#include "formcheckpoint.h" NewCheckMethod::NewCheckMethod(QWidget *parent) : QWidget(parent), @@ -40,3 +41,11 @@ { ui->label_11->clear(); } + +void NewCheckMethod::showCheckPoint() +{ + FormCheckPoint *checkWindow = new FormCheckPoint; + //checkWindow.setWindowState(Qt::WindowMaximized); + checkWindow->setWindowModality(Qt::ApplicationModal); + checkWindow->show(); +} diff --git a/softwareDirectory/AutoVerScheme/newcheckmethod.h b/softwareDirectory/AutoVerScheme/newcheckmethod.h index e923401..8a26b0f 100644 --- a/softwareDirectory/AutoVerScheme/newcheckmethod.h +++ b/softwareDirectory/AutoVerScheme/newcheckmethod.h @@ -18,6 +18,7 @@ void showCheckDevice(); void choosePicture(); void deletePicture(); + void showCheckPoint(); private: Ui::NewCheckMethod *ui; diff --git a/softwareDirectory/AutoVerScheme/newcheckmethod.ui b/softwareDirectory/AutoVerScheme/newcheckmethod.ui index 516b62e..27a8951 100644 --- a/softwareDirectory/AutoVerScheme/newcheckmethod.ui +++ b/softwareDirectory/AutoVerScheme/newcheckmethod.ui @@ -567,8 +567,8 @@ showCheckDevice() - 1255 - 221 + 1304 + 257 1333 @@ -583,8 +583,8 @@ choosePicture() - 287 - 184 + 394 + 222 266 @@ -599,8 +599,8 @@ deletePicture() - 375 - 189 + 513 + 222 385 @@ -608,10 +608,27 @@ + + pushButton_8 + clicked() + NewCheckMethod + showCheckPoint() + + + 1280 + 753 + + + 1337 + 716 + + + showCheckDevice() choosePicture() deletePicture() + showCheckPoint() diff --git a/softwareDirectory/AutoVerScheme/newverifymethod.cpp b/softwareDirectory/AutoVerScheme/newverifymethod.cpp index e07a035..d3d5abd 100644 --- a/softwareDirectory/AutoVerScheme/newverifymethod.cpp +++ b/softwareDirectory/AutoVerScheme/newverifymethod.cpp @@ -1,6 +1,7 @@ #include "newverifymethod.h" #include "ui_newverifymethod.h" #include "verifydevice.h" +#include "formverypoint.h" NewVerifyMethod::NewVerifyMethod(QWidget *parent) : QWidget(parent), @@ -21,3 +22,11 @@ checkWindow->setWindowModality(Qt::ApplicationModal); checkWindow->show(); } + +void NewVerifyMethod::showVeryPoint() +{ + FormVeryPoint *checkWindow = new FormVeryPoint; + //checkWindow.setWindowState(Qt::WindowMaximized); + checkWindow->setWindowModality(Qt::ApplicationModal); + checkWindow->show(); +} diff --git a/softwareDirectory/AutoVerScheme/newverifymethod.h b/softwareDirectory/AutoVerScheme/newverifymethod.h index 46caeb4..1c262c0 100644 --- a/softwareDirectory/AutoVerScheme/newverifymethod.h +++ b/softwareDirectory/AutoVerScheme/newverifymethod.h @@ -16,6 +16,7 @@ ~NewVerifyMethod(); private slots: void showVerifyDevice(); + void showVeryPoint(); private: Ui::NewVerifyMethod *ui; }; diff --git a/softwareDirectory/AutoVerScheme/newverifymethod.ui b/softwareDirectory/AutoVerScheme/newverifymethod.ui index 9fa8239..32fd7e2 100644 --- a/softwareDirectory/AutoVerScheme/newverifymethod.ui +++ b/softwareDirectory/AutoVerScheme/newverifymethod.ui @@ -437,8 +437,25 @@ + + pushButton_14 + clicked() + NewVerifyMethod + showVeryPoint() + + + 1279 + 755 + + + 1338 + 754 + + + showVerifyDevice() + showVeryPoint() diff --git a/softwareDirectory/AutoVerScheme/AutoVerScheme.pro b/softwareDirectory/AutoVerScheme/AutoVerScheme.pro index b7a7f10..4b3cb2b 100644 --- a/softwareDirectory/AutoVerScheme/AutoVerScheme.pro +++ b/softwareDirectory/AutoVerScheme/AutoVerScheme.pro @@ -31,6 +31,8 @@ depar_task.cpp \ depar_task_server.cpp \ dialogcheckresult.cpp \ + formcheckpoint.cpp \ + formverypoint.cpp \ indexwindow.cpp \ infomanageview.cpp \ inspectdataitem.cpp \ @@ -66,6 +68,8 @@ depar_task.h \ depar_task_server.h \ dialogcheckresult.h \ + formcheckpoint.h \ + formverypoint.h \ indexwindow.h \ infomanageview.h \ inspectdataitem.h \ @@ -94,6 +98,8 @@ datasyncview.ui \ depar_task.ui \ dialogcheckresult.ui \ + formcheckpoint.ui \ + formverypoint.ui \ indexwindow.ui \ infomanageview.ui \ inspectdataitem.ui \ diff --git a/softwareDirectory/AutoVerScheme/AutoVerScheme.pro.user b/softwareDirectory/AutoVerScheme/AutoVerScheme.pro.user index b379c65..c5290fc 100644 --- a/softwareDirectory/AutoVerScheme/AutoVerScheme.pro.user +++ b/softwareDirectory/AutoVerScheme/AutoVerScheme.pro.user @@ -1,10 +1,10 @@ - + EnvironmentId - {94e4c4a1-54d4-412c-b108-da01d63f0d97} + {2746248a-b112-4e0f-9ae0-9e61f2a42309} ProjectExplorer.Project.ActiveTarget @@ -55,23 +55,40 @@ ProjectExplorer.Project.PluginSettings + + true + true + true + true + + 0 + true -fno-delayed-template-parsing true + + true + Builtin.TidyAndClazy + 4 + + + + true + ProjectExplorer.Project.Target.0 - Desktop Qt 5.14.2 MinGW 32-bit - Desktop Qt 5.14.2 MinGW 32-bit - qt.qt5.5142.win32_mingw73_kit + 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:/work/code/BJJZ/svntest/softwareDirectory/build-AutoVerScheme-Desktop_Qt_5_14_2_MinGW_32_bit-Debug + D:/dev/software/softwareDirectory/build-AutoVerScheme-Desktop_Qt_5_14_2_MinGW_64_bit-Debug true @@ -119,7 +136,7 @@ 2 - D:/work/code/BJJZ/svntest/softwareDirectory/build-AutoVerScheme-Desktop_Qt_5_14_2_MinGW_32_bit-Release + D:/dev/software/softwareDirectory/build-AutoVerScheme-Desktop_Qt_5_14_2_MinGW_64_bit-Release true @@ -167,7 +184,7 @@ 0 - D:/work/code/BJJZ/svntest/softwareDirectory/build-AutoVerScheme-Desktop_Qt_5_14_2_MinGW_32_bit-Profile + D:/dev/software/softwareDirectory/build-AutoVerScheme-Desktop_Qt_5_14_2_MinGW_64_bit-Profile true @@ -287,8 +304,8 @@ 2 - Qt4ProjectManager.Qt4RunConfiguration:D:/work/code/BJJZ/svntest/softwareDirectory/AutoVerScheme/AutoVerScheme.pro - D:/work/code/BJJZ/svntest/softwareDirectory/AutoVerScheme/AutoVerScheme.pro + Qt4ProjectManager.Qt4RunConfiguration:D:/dev/software/softwareDirectory/AutoVerScheme/AutoVerScheme.pro + D:/dev/software/softwareDirectory/AutoVerScheme/AutoVerScheme.pro false @@ -299,7 +316,7 @@ false true - D:/work/code/BJJZ/svntest/softwareDirectory/build-AutoVerScheme-Desktop_Qt_5_14_2_MinGW_32_bit-Debug + D:/dev/software/softwareDirectory/build-AutoVerScheme-Desktop_Qt_5_14_2_MinGW_64_bit-Debug 1 @@ -307,14 +324,14 @@ ProjectExplorer.Project.Target.1 - Desktop Qt 5.14.2 MinGW 64-bit - Desktop Qt 5.14.2 MinGW 64-bit - qt.qt5.5142.win64_mingw73_kit + 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:/work/code/BJJZ/svntest/softwareDirectory/build-AutoVerScheme-Desktop_Qt_5_14_2_MinGW_64_bit-Debug + D:/dev/software/softwareDirectory/build-AutoVerScheme-Desktop_Qt_5_14_2_MinGW_32_bit-Debug true @@ -362,7 +379,7 @@ 2 - D:/work/code/BJJZ/svntest/softwareDirectory/build-AutoVerScheme-Desktop_Qt_5_14_2_MinGW_64_bit-Release + D:/dev/software/softwareDirectory/build-AutoVerScheme-Desktop_Qt_5_14_2_MinGW_32_bit-Release true @@ -410,7 +427,7 @@ 0 - D:/work/code/BJJZ/svntest/softwareDirectory/build-AutoVerScheme-Desktop_Qt_5_14_2_MinGW_64_bit-Profile + D:/dev/software/softwareDirectory/build-AutoVerScheme-Desktop_Qt_5_14_2_MinGW_32_bit-Profile true @@ -530,14 +547,14 @@ 2 - - ProjectExplorer.CustomExecutableRunConfiguration - + Qt4ProjectManager.Qt4RunConfiguration:D:/dev/software/softwareDirectory/AutoVerScheme/AutoVerScheme.pro + D:/dev/software/softwareDirectory/AutoVerScheme/AutoVerScheme.pro false false true + true false false true diff --git a/softwareDirectory/AutoVerScheme/AutoVerScheme.pro.user.94e4c4a b/softwareDirectory/AutoVerScheme/AutoVerScheme.pro.user.94e4c4a new file mode 100644 index 0000000..742ac25 --- /dev/null +++ b/softwareDirectory/AutoVerScheme/AutoVerScheme.pro.user.94e4c4a @@ -0,0 +1,562 @@ + + + + + + EnvironmentId + {94e4c4a1-54d4-412c-b108-da01d63f0d97} + + + 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 32-bit + Desktop Qt 5.14.2 MinGW 32-bit + qt.qt5.5142.win32_mingw73_kit + 0 + 0 + 0 + + D:/work/code/BJJZ/svntest/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:/work/code/BJJZ/svntest/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:/work/code/BJJZ/svntest/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:/work/code/BJJZ/svntest/softwareDirectory/AutoVerScheme/AutoVerScheme.pro + D:/work/code/BJJZ/svntest/softwareDirectory/AutoVerScheme/AutoVerScheme.pro + + false + + false + true + true + false + false + true + + D:/work/code/BJJZ/svntest/softwareDirectory/build-AutoVerScheme-Desktop_Qt_5_14_2_MinGW_32_bit-Debug + + 1 + + + + ProjectExplorer.Project.Target.1 + + 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:/work/code/BJJZ/svntest/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:/work/code/BJJZ/svntest/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:/work/code/BJJZ/svntest/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 + + + ProjectExplorer.CustomExecutableRunConfiguration + + + false + + false + true + false + false + true + + + + 1 + + + + ProjectExplorer.Project.TargetCount + 2 + + + ProjectExplorer.Project.Updater.FileVersion + 22 + + + Version + 22 + + diff --git a/softwareDirectory/AutoVerScheme/checkdevice.cpp b/softwareDirectory/AutoVerScheme/checkdevice.cpp index 5497af2..d540aa6 100644 --- a/softwareDirectory/AutoVerScheme/checkdevice.cpp +++ b/softwareDirectory/AutoVerScheme/checkdevice.cpp @@ -14,6 +14,7 @@ ui->tableWidget_4->setColumnWidth(0, 80); for(int i=1;i<5;i++) ui->tableWidget_4->horizontalHeader()->setSectionResizeMode(i,QHeaderView::Stretch); + getCheckDevice(); getStandardDevice(); } @@ -22,6 +23,23 @@ delete ui; } +void CheckDevice::getCheckDevice() +{ + int rowCount=0; + int row=0; + QList data = BaseCommonApi::getTestedDevice(); + for (const TestedDevice& bizDevice : data) { + rowCount = ui->tableWidget_3->rowCount(); + ui->tableWidget_3->insertRow(rowCount); + QCheckBox *checkBox = new QCheckBox; + ui->tableWidget_3->setCellWidget(row, 0, checkBox); + ui->tableWidget_4->setItem(row, 1, new QTableWidgetItem(bizDevice.equipment_name)); + ui->tableWidget_4->setItem(row, 2, new QTableWidgetItem(bizDevice.model)); + ui->tableWidget_4->setItem(row, 3, new QTableWidgetItem(bizDevice.help_instruction)); + row++; + } +} + void CheckDevice::getStandardDevice() { int rowCount=0; diff --git a/softwareDirectory/AutoVerScheme/checkdevice.h b/softwareDirectory/AutoVerScheme/checkdevice.h index fc42d90..8102d24 100644 --- a/softwareDirectory/AutoVerScheme/checkdevice.h +++ b/softwareDirectory/AutoVerScheme/checkdevice.h @@ -16,6 +16,7 @@ ~CheckDevice(); private: + void getCheckDevice(); void getStandardDevice(); private: diff --git a/softwareDirectory/AutoVerScheme/depar_task.cpp b/softwareDirectory/AutoVerScheme/depar_task.cpp index 5b5c3ef..ea7c6a2 100644 --- a/softwareDirectory/AutoVerScheme/depar_task.cpp +++ b/softwareDirectory/AutoVerScheme/depar_task.cpp @@ -97,7 +97,7 @@ ui->tableWidget->setItem(row, 5, new QTableWidgetItem(dept.manufacturer)); //设置数据 ui->tableWidget->setItem(row, 6, new QTableWidgetItem(dept.customer_name)); //设置数据 ui->tableWidget->setItem(row, 7, new QTableWidgetItem(dept.FULL_NAME)); //设置数据 - ui->tableWidget->setItem(row, 8, new QTableWidgetItem(dept.require_over_time)); //设置数据 + ui->tableWidget->setItem(row, 8, new QTableWidgetItem(dept.require_over_time.toString())); //设置数据 if(dept.is_urgent=="1") State="是"; else diff --git a/softwareDirectory/AutoVerScheme/formcheckpoint.cpp b/softwareDirectory/AutoVerScheme/formcheckpoint.cpp new file mode 100644 index 0000000..5ff2d74 --- /dev/null +++ b/softwareDirectory/AutoVerScheme/formcheckpoint.cpp @@ -0,0 +1,14 @@ +#include "formcheckpoint.h" +#include "ui_formcheckpoint.h" + +FormCheckPoint::FormCheckPoint(QWidget *parent) : + QWidget(parent), + ui(new Ui::FormCheckPoint) +{ + ui->setupUi(this); +} + +FormCheckPoint::~FormCheckPoint() +{ + delete ui; +} diff --git a/softwareDirectory/AutoVerScheme/formcheckpoint.h b/softwareDirectory/AutoVerScheme/formcheckpoint.h new file mode 100644 index 0000000..5f8ccf0 --- /dev/null +++ b/softwareDirectory/AutoVerScheme/formcheckpoint.h @@ -0,0 +1,22 @@ +#ifndef FORMCHECKPOINT_H +#define FORMCHECKPOINT_H + +#include + +namespace Ui { +class FormCheckPoint; +} + +class FormCheckPoint : public QWidget +{ + Q_OBJECT + +public: + explicit FormCheckPoint(QWidget *parent = nullptr); + ~FormCheckPoint(); + +private: + Ui::FormCheckPoint *ui; +}; + +#endif // FORMCHECKPOINT_H diff --git a/softwareDirectory/AutoVerScheme/formcheckpoint.ui b/softwareDirectory/AutoVerScheme/formcheckpoint.ui new file mode 100644 index 0000000..3a6eb47 --- /dev/null +++ b/softwareDirectory/AutoVerScheme/formcheckpoint.ui @@ -0,0 +1,168 @@ + + + FormCheckPoint + + + + 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); + + + + + + + 12 + 75 + true + + + + 检定项目及检定点 + + + + + + + + + + + + + + + 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/formverypoint.cpp b/softwareDirectory/AutoVerScheme/formverypoint.cpp new file mode 100644 index 0000000..d1cec57 --- /dev/null +++ b/softwareDirectory/AutoVerScheme/formverypoint.cpp @@ -0,0 +1,14 @@ +#include "formverypoint.h" +#include "ui_formverypoint.h" + +FormVeryPoint::FormVeryPoint(QWidget *parent) : + QWidget(parent), + ui(new Ui::FormVeryPoint) +{ + ui->setupUi(this); +} + +FormVeryPoint::~FormVeryPoint() +{ + delete ui; +} diff --git a/softwareDirectory/AutoVerScheme/formverypoint.h b/softwareDirectory/AutoVerScheme/formverypoint.h new file mode 100644 index 0000000..bb6555c --- /dev/null +++ b/softwareDirectory/AutoVerScheme/formverypoint.h @@ -0,0 +1,22 @@ +#ifndef FORMVERYPOINT_H +#define FORMVERYPOINT_H + +#include + +namespace Ui { +class FormVeryPoint; +} + +class FormVeryPoint : public QWidget +{ + Q_OBJECT + +public: + explicit FormVeryPoint(QWidget *parent = nullptr); + ~FormVeryPoint(); + +private: + Ui::FormVeryPoint *ui; +}; + +#endif // FORMVERYPOINT_H diff --git a/softwareDirectory/AutoVerScheme/formverypoint.ui b/softwareDirectory/AutoVerScheme/formverypoint.ui new file mode 100644 index 0000000..c7fbf84 --- /dev/null +++ b/softwareDirectory/AutoVerScheme/formverypoint.ui @@ -0,0 +1,168 @@ + + + FormVeryPoint + + + + 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); + + + + + + + 12 + 75 + true + + + + 核查项目及核查点 + + + + + + + + + + + + + + + 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/my_task.cpp b/softwareDirectory/AutoVerScheme/my_task.cpp index 8d7abf7..fb72684 100644 --- a/softwareDirectory/AutoVerScheme/my_task.cpp +++ b/softwareDirectory/AutoVerScheme/my_task.cpp @@ -89,7 +89,7 @@ ui->tableWidget->setItem(row, 5, new QTableWidgetItem(myTask.manufacturer)); //设置数据 ui->tableWidget->setItem(row, 6, new QTableWidgetItem(myTask.customer_name)); //设置数据 ui->tableWidget->setItem(row, 7, new QTableWidgetItem(myTask.FULL_NAME)); //设置数据 - ui->tableWidget->setItem(row, 8, new QTableWidgetItem(myTask.require_over_time)); //设置数据 + ui->tableWidget->setItem(row, 8, new QTableWidgetItem(myTask.require_over_time.toString())); //设置数据 if(myTask.is_urgent=="1") State="是"; else diff --git a/softwareDirectory/AutoVerScheme/newcheckmethod.cpp b/softwareDirectory/AutoVerScheme/newcheckmethod.cpp index 9f0160a..eee7e48 100644 --- a/softwareDirectory/AutoVerScheme/newcheckmethod.cpp +++ b/softwareDirectory/AutoVerScheme/newcheckmethod.cpp @@ -2,6 +2,7 @@ #include "ui_newcheckmethod.h" #include "checkdevice.h" #include "qfiledialog.h" +#include "formcheckpoint.h" NewCheckMethod::NewCheckMethod(QWidget *parent) : QWidget(parent), @@ -40,3 +41,11 @@ { ui->label_11->clear(); } + +void NewCheckMethod::showCheckPoint() +{ + FormCheckPoint *checkWindow = new FormCheckPoint; + //checkWindow.setWindowState(Qt::WindowMaximized); + checkWindow->setWindowModality(Qt::ApplicationModal); + checkWindow->show(); +} diff --git a/softwareDirectory/AutoVerScheme/newcheckmethod.h b/softwareDirectory/AutoVerScheme/newcheckmethod.h index e923401..8a26b0f 100644 --- a/softwareDirectory/AutoVerScheme/newcheckmethod.h +++ b/softwareDirectory/AutoVerScheme/newcheckmethod.h @@ -18,6 +18,7 @@ void showCheckDevice(); void choosePicture(); void deletePicture(); + void showCheckPoint(); private: Ui::NewCheckMethod *ui; diff --git a/softwareDirectory/AutoVerScheme/newcheckmethod.ui b/softwareDirectory/AutoVerScheme/newcheckmethod.ui index 516b62e..27a8951 100644 --- a/softwareDirectory/AutoVerScheme/newcheckmethod.ui +++ b/softwareDirectory/AutoVerScheme/newcheckmethod.ui @@ -567,8 +567,8 @@ showCheckDevice() - 1255 - 221 + 1304 + 257 1333 @@ -583,8 +583,8 @@ choosePicture() - 287 - 184 + 394 + 222 266 @@ -599,8 +599,8 @@ deletePicture() - 375 - 189 + 513 + 222 385 @@ -608,10 +608,27 @@ + + pushButton_8 + clicked() + NewCheckMethod + showCheckPoint() + + + 1280 + 753 + + + 1337 + 716 + + + showCheckDevice() choosePicture() deletePicture() + showCheckPoint() diff --git a/softwareDirectory/AutoVerScheme/newverifymethod.cpp b/softwareDirectory/AutoVerScheme/newverifymethod.cpp index e07a035..d3d5abd 100644 --- a/softwareDirectory/AutoVerScheme/newverifymethod.cpp +++ b/softwareDirectory/AutoVerScheme/newverifymethod.cpp @@ -1,6 +1,7 @@ #include "newverifymethod.h" #include "ui_newverifymethod.h" #include "verifydevice.h" +#include "formverypoint.h" NewVerifyMethod::NewVerifyMethod(QWidget *parent) : QWidget(parent), @@ -21,3 +22,11 @@ checkWindow->setWindowModality(Qt::ApplicationModal); checkWindow->show(); } + +void NewVerifyMethod::showVeryPoint() +{ + FormVeryPoint *checkWindow = new FormVeryPoint; + //checkWindow.setWindowState(Qt::WindowMaximized); + checkWindow->setWindowModality(Qt::ApplicationModal); + checkWindow->show(); +} diff --git a/softwareDirectory/AutoVerScheme/newverifymethod.h b/softwareDirectory/AutoVerScheme/newverifymethod.h index 46caeb4..1c262c0 100644 --- a/softwareDirectory/AutoVerScheme/newverifymethod.h +++ b/softwareDirectory/AutoVerScheme/newverifymethod.h @@ -16,6 +16,7 @@ ~NewVerifyMethod(); private slots: void showVerifyDevice(); + void showVeryPoint(); private: Ui::NewVerifyMethod *ui; }; diff --git a/softwareDirectory/AutoVerScheme/newverifymethod.ui b/softwareDirectory/AutoVerScheme/newverifymethod.ui index 9fa8239..32fd7e2 100644 --- a/softwareDirectory/AutoVerScheme/newverifymethod.ui +++ b/softwareDirectory/AutoVerScheme/newverifymethod.ui @@ -437,8 +437,25 @@ + + pushButton_14 + clicked() + NewVerifyMethod + showVeryPoint() + + + 1279 + 755 + + + 1338 + 754 + + + showVerifyDevice() + showVeryPoint() diff --git a/softwareDirectory/AutoVerScheme/verifydevice.cpp b/softwareDirectory/AutoVerScheme/verifydevice.cpp index 27fb42c..1a13c60 100644 --- a/softwareDirectory/AutoVerScheme/verifydevice.cpp +++ b/softwareDirectory/AutoVerScheme/verifydevice.cpp @@ -25,11 +25,6 @@ void VerifyDevice::getVerifyDevice() { - BaseCommonApi dbManager; - // 调用数据库管理器的函数获取数据 - - - int rowCount=0; int row=0; QList data = BaseCommonApi::getBizDeviceManage(); @@ -48,11 +43,6 @@ void VerifyDevice::getCheckDevice() { - - BaseCommonApi dbManager; - // 调用数据库管理器的函数获取数据 - - int rowCount=0; int row=0; QList data = BaseCommonApi::getBizDeviceManage(); diff --git a/softwareDirectory/AutoVerScheme/AutoVerScheme.pro b/softwareDirectory/AutoVerScheme/AutoVerScheme.pro index b7a7f10..4b3cb2b 100644 --- a/softwareDirectory/AutoVerScheme/AutoVerScheme.pro +++ b/softwareDirectory/AutoVerScheme/AutoVerScheme.pro @@ -31,6 +31,8 @@ depar_task.cpp \ depar_task_server.cpp \ dialogcheckresult.cpp \ + formcheckpoint.cpp \ + formverypoint.cpp \ indexwindow.cpp \ infomanageview.cpp \ inspectdataitem.cpp \ @@ -66,6 +68,8 @@ depar_task.h \ depar_task_server.h \ dialogcheckresult.h \ + formcheckpoint.h \ + formverypoint.h \ indexwindow.h \ infomanageview.h \ inspectdataitem.h \ @@ -94,6 +98,8 @@ datasyncview.ui \ depar_task.ui \ dialogcheckresult.ui \ + formcheckpoint.ui \ + formverypoint.ui \ indexwindow.ui \ infomanageview.ui \ inspectdataitem.ui \ diff --git a/softwareDirectory/AutoVerScheme/AutoVerScheme.pro.user b/softwareDirectory/AutoVerScheme/AutoVerScheme.pro.user index b379c65..c5290fc 100644 --- a/softwareDirectory/AutoVerScheme/AutoVerScheme.pro.user +++ b/softwareDirectory/AutoVerScheme/AutoVerScheme.pro.user @@ -1,10 +1,10 @@ - + EnvironmentId - {94e4c4a1-54d4-412c-b108-da01d63f0d97} + {2746248a-b112-4e0f-9ae0-9e61f2a42309} ProjectExplorer.Project.ActiveTarget @@ -55,23 +55,40 @@ ProjectExplorer.Project.PluginSettings + + true + true + true + true + + 0 + true -fno-delayed-template-parsing true + + true + Builtin.TidyAndClazy + 4 + + + + true + ProjectExplorer.Project.Target.0 - Desktop Qt 5.14.2 MinGW 32-bit - Desktop Qt 5.14.2 MinGW 32-bit - qt.qt5.5142.win32_mingw73_kit + 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:/work/code/BJJZ/svntest/softwareDirectory/build-AutoVerScheme-Desktop_Qt_5_14_2_MinGW_32_bit-Debug + D:/dev/software/softwareDirectory/build-AutoVerScheme-Desktop_Qt_5_14_2_MinGW_64_bit-Debug true @@ -119,7 +136,7 @@ 2 - D:/work/code/BJJZ/svntest/softwareDirectory/build-AutoVerScheme-Desktop_Qt_5_14_2_MinGW_32_bit-Release + D:/dev/software/softwareDirectory/build-AutoVerScheme-Desktop_Qt_5_14_2_MinGW_64_bit-Release true @@ -167,7 +184,7 @@ 0 - D:/work/code/BJJZ/svntest/softwareDirectory/build-AutoVerScheme-Desktop_Qt_5_14_2_MinGW_32_bit-Profile + D:/dev/software/softwareDirectory/build-AutoVerScheme-Desktop_Qt_5_14_2_MinGW_64_bit-Profile true @@ -287,8 +304,8 @@ 2 - Qt4ProjectManager.Qt4RunConfiguration:D:/work/code/BJJZ/svntest/softwareDirectory/AutoVerScheme/AutoVerScheme.pro - D:/work/code/BJJZ/svntest/softwareDirectory/AutoVerScheme/AutoVerScheme.pro + Qt4ProjectManager.Qt4RunConfiguration:D:/dev/software/softwareDirectory/AutoVerScheme/AutoVerScheme.pro + D:/dev/software/softwareDirectory/AutoVerScheme/AutoVerScheme.pro false @@ -299,7 +316,7 @@ false true - D:/work/code/BJJZ/svntest/softwareDirectory/build-AutoVerScheme-Desktop_Qt_5_14_2_MinGW_32_bit-Debug + D:/dev/software/softwareDirectory/build-AutoVerScheme-Desktop_Qt_5_14_2_MinGW_64_bit-Debug 1 @@ -307,14 +324,14 @@ ProjectExplorer.Project.Target.1 - Desktop Qt 5.14.2 MinGW 64-bit - Desktop Qt 5.14.2 MinGW 64-bit - qt.qt5.5142.win64_mingw73_kit + 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:/work/code/BJJZ/svntest/softwareDirectory/build-AutoVerScheme-Desktop_Qt_5_14_2_MinGW_64_bit-Debug + D:/dev/software/softwareDirectory/build-AutoVerScheme-Desktop_Qt_5_14_2_MinGW_32_bit-Debug true @@ -362,7 +379,7 @@ 2 - D:/work/code/BJJZ/svntest/softwareDirectory/build-AutoVerScheme-Desktop_Qt_5_14_2_MinGW_64_bit-Release + D:/dev/software/softwareDirectory/build-AutoVerScheme-Desktop_Qt_5_14_2_MinGW_32_bit-Release true @@ -410,7 +427,7 @@ 0 - D:/work/code/BJJZ/svntest/softwareDirectory/build-AutoVerScheme-Desktop_Qt_5_14_2_MinGW_64_bit-Profile + D:/dev/software/softwareDirectory/build-AutoVerScheme-Desktop_Qt_5_14_2_MinGW_32_bit-Profile true @@ -530,14 +547,14 @@ 2 - - ProjectExplorer.CustomExecutableRunConfiguration - + Qt4ProjectManager.Qt4RunConfiguration:D:/dev/software/softwareDirectory/AutoVerScheme/AutoVerScheme.pro + D:/dev/software/softwareDirectory/AutoVerScheme/AutoVerScheme.pro false false true + true false false true diff --git a/softwareDirectory/AutoVerScheme/AutoVerScheme.pro.user.94e4c4a b/softwareDirectory/AutoVerScheme/AutoVerScheme.pro.user.94e4c4a new file mode 100644 index 0000000..742ac25 --- /dev/null +++ b/softwareDirectory/AutoVerScheme/AutoVerScheme.pro.user.94e4c4a @@ -0,0 +1,562 @@ + + + + + + EnvironmentId + {94e4c4a1-54d4-412c-b108-da01d63f0d97} + + + 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 32-bit + Desktop Qt 5.14.2 MinGW 32-bit + qt.qt5.5142.win32_mingw73_kit + 0 + 0 + 0 + + D:/work/code/BJJZ/svntest/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:/work/code/BJJZ/svntest/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:/work/code/BJJZ/svntest/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:/work/code/BJJZ/svntest/softwareDirectory/AutoVerScheme/AutoVerScheme.pro + D:/work/code/BJJZ/svntest/softwareDirectory/AutoVerScheme/AutoVerScheme.pro + + false + + false + true + true + false + false + true + + D:/work/code/BJJZ/svntest/softwareDirectory/build-AutoVerScheme-Desktop_Qt_5_14_2_MinGW_32_bit-Debug + + 1 + + + + ProjectExplorer.Project.Target.1 + + 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:/work/code/BJJZ/svntest/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:/work/code/BJJZ/svntest/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:/work/code/BJJZ/svntest/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 + + + ProjectExplorer.CustomExecutableRunConfiguration + + + false + + false + true + false + false + true + + + + 1 + + + + ProjectExplorer.Project.TargetCount + 2 + + + ProjectExplorer.Project.Updater.FileVersion + 22 + + + Version + 22 + + diff --git a/softwareDirectory/AutoVerScheme/checkdevice.cpp b/softwareDirectory/AutoVerScheme/checkdevice.cpp index 5497af2..d540aa6 100644 --- a/softwareDirectory/AutoVerScheme/checkdevice.cpp +++ b/softwareDirectory/AutoVerScheme/checkdevice.cpp @@ -14,6 +14,7 @@ ui->tableWidget_4->setColumnWidth(0, 80); for(int i=1;i<5;i++) ui->tableWidget_4->horizontalHeader()->setSectionResizeMode(i,QHeaderView::Stretch); + getCheckDevice(); getStandardDevice(); } @@ -22,6 +23,23 @@ delete ui; } +void CheckDevice::getCheckDevice() +{ + int rowCount=0; + int row=0; + QList data = BaseCommonApi::getTestedDevice(); + for (const TestedDevice& bizDevice : data) { + rowCount = ui->tableWidget_3->rowCount(); + ui->tableWidget_3->insertRow(rowCount); + QCheckBox *checkBox = new QCheckBox; + ui->tableWidget_3->setCellWidget(row, 0, checkBox); + ui->tableWidget_4->setItem(row, 1, new QTableWidgetItem(bizDevice.equipment_name)); + ui->tableWidget_4->setItem(row, 2, new QTableWidgetItem(bizDevice.model)); + ui->tableWidget_4->setItem(row, 3, new QTableWidgetItem(bizDevice.help_instruction)); + row++; + } +} + void CheckDevice::getStandardDevice() { int rowCount=0; diff --git a/softwareDirectory/AutoVerScheme/checkdevice.h b/softwareDirectory/AutoVerScheme/checkdevice.h index fc42d90..8102d24 100644 --- a/softwareDirectory/AutoVerScheme/checkdevice.h +++ b/softwareDirectory/AutoVerScheme/checkdevice.h @@ -16,6 +16,7 @@ ~CheckDevice(); private: + void getCheckDevice(); void getStandardDevice(); private: diff --git a/softwareDirectory/AutoVerScheme/depar_task.cpp b/softwareDirectory/AutoVerScheme/depar_task.cpp index 5b5c3ef..ea7c6a2 100644 --- a/softwareDirectory/AutoVerScheme/depar_task.cpp +++ b/softwareDirectory/AutoVerScheme/depar_task.cpp @@ -97,7 +97,7 @@ ui->tableWidget->setItem(row, 5, new QTableWidgetItem(dept.manufacturer)); //设置数据 ui->tableWidget->setItem(row, 6, new QTableWidgetItem(dept.customer_name)); //设置数据 ui->tableWidget->setItem(row, 7, new QTableWidgetItem(dept.FULL_NAME)); //设置数据 - ui->tableWidget->setItem(row, 8, new QTableWidgetItem(dept.require_over_time)); //设置数据 + ui->tableWidget->setItem(row, 8, new QTableWidgetItem(dept.require_over_time.toString())); //设置数据 if(dept.is_urgent=="1") State="是"; else diff --git a/softwareDirectory/AutoVerScheme/formcheckpoint.cpp b/softwareDirectory/AutoVerScheme/formcheckpoint.cpp new file mode 100644 index 0000000..5ff2d74 --- /dev/null +++ b/softwareDirectory/AutoVerScheme/formcheckpoint.cpp @@ -0,0 +1,14 @@ +#include "formcheckpoint.h" +#include "ui_formcheckpoint.h" + +FormCheckPoint::FormCheckPoint(QWidget *parent) : + QWidget(parent), + ui(new Ui::FormCheckPoint) +{ + ui->setupUi(this); +} + +FormCheckPoint::~FormCheckPoint() +{ + delete ui; +} diff --git a/softwareDirectory/AutoVerScheme/formcheckpoint.h b/softwareDirectory/AutoVerScheme/formcheckpoint.h new file mode 100644 index 0000000..5f8ccf0 --- /dev/null +++ b/softwareDirectory/AutoVerScheme/formcheckpoint.h @@ -0,0 +1,22 @@ +#ifndef FORMCHECKPOINT_H +#define FORMCHECKPOINT_H + +#include + +namespace Ui { +class FormCheckPoint; +} + +class FormCheckPoint : public QWidget +{ + Q_OBJECT + +public: + explicit FormCheckPoint(QWidget *parent = nullptr); + ~FormCheckPoint(); + +private: + Ui::FormCheckPoint *ui; +}; + +#endif // FORMCHECKPOINT_H diff --git a/softwareDirectory/AutoVerScheme/formcheckpoint.ui b/softwareDirectory/AutoVerScheme/formcheckpoint.ui new file mode 100644 index 0000000..3a6eb47 --- /dev/null +++ b/softwareDirectory/AutoVerScheme/formcheckpoint.ui @@ -0,0 +1,168 @@ + + + FormCheckPoint + + + + 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); + + + + + + + 12 + 75 + true + + + + 检定项目及检定点 + + + + + + + + + + + + + + + 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/formverypoint.cpp b/softwareDirectory/AutoVerScheme/formverypoint.cpp new file mode 100644 index 0000000..d1cec57 --- /dev/null +++ b/softwareDirectory/AutoVerScheme/formverypoint.cpp @@ -0,0 +1,14 @@ +#include "formverypoint.h" +#include "ui_formverypoint.h" + +FormVeryPoint::FormVeryPoint(QWidget *parent) : + QWidget(parent), + ui(new Ui::FormVeryPoint) +{ + ui->setupUi(this); +} + +FormVeryPoint::~FormVeryPoint() +{ + delete ui; +} diff --git a/softwareDirectory/AutoVerScheme/formverypoint.h b/softwareDirectory/AutoVerScheme/formverypoint.h new file mode 100644 index 0000000..bb6555c --- /dev/null +++ b/softwareDirectory/AutoVerScheme/formverypoint.h @@ -0,0 +1,22 @@ +#ifndef FORMVERYPOINT_H +#define FORMVERYPOINT_H + +#include + +namespace Ui { +class FormVeryPoint; +} + +class FormVeryPoint : public QWidget +{ + Q_OBJECT + +public: + explicit FormVeryPoint(QWidget *parent = nullptr); + ~FormVeryPoint(); + +private: + Ui::FormVeryPoint *ui; +}; + +#endif // FORMVERYPOINT_H diff --git a/softwareDirectory/AutoVerScheme/formverypoint.ui b/softwareDirectory/AutoVerScheme/formverypoint.ui new file mode 100644 index 0000000..c7fbf84 --- /dev/null +++ b/softwareDirectory/AutoVerScheme/formverypoint.ui @@ -0,0 +1,168 @@ + + + FormVeryPoint + + + + 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); + + + + + + + 12 + 75 + true + + + + 核查项目及核查点 + + + + + + + + + + + + + + + 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/my_task.cpp b/softwareDirectory/AutoVerScheme/my_task.cpp index 8d7abf7..fb72684 100644 --- a/softwareDirectory/AutoVerScheme/my_task.cpp +++ b/softwareDirectory/AutoVerScheme/my_task.cpp @@ -89,7 +89,7 @@ ui->tableWidget->setItem(row, 5, new QTableWidgetItem(myTask.manufacturer)); //设置数据 ui->tableWidget->setItem(row, 6, new QTableWidgetItem(myTask.customer_name)); //设置数据 ui->tableWidget->setItem(row, 7, new QTableWidgetItem(myTask.FULL_NAME)); //设置数据 - ui->tableWidget->setItem(row, 8, new QTableWidgetItem(myTask.require_over_time)); //设置数据 + ui->tableWidget->setItem(row, 8, new QTableWidgetItem(myTask.require_over_time.toString())); //设置数据 if(myTask.is_urgent=="1") State="是"; else diff --git a/softwareDirectory/AutoVerScheme/newcheckmethod.cpp b/softwareDirectory/AutoVerScheme/newcheckmethod.cpp index 9f0160a..eee7e48 100644 --- a/softwareDirectory/AutoVerScheme/newcheckmethod.cpp +++ b/softwareDirectory/AutoVerScheme/newcheckmethod.cpp @@ -2,6 +2,7 @@ #include "ui_newcheckmethod.h" #include "checkdevice.h" #include "qfiledialog.h" +#include "formcheckpoint.h" NewCheckMethod::NewCheckMethod(QWidget *parent) : QWidget(parent), @@ -40,3 +41,11 @@ { ui->label_11->clear(); } + +void NewCheckMethod::showCheckPoint() +{ + FormCheckPoint *checkWindow = new FormCheckPoint; + //checkWindow.setWindowState(Qt::WindowMaximized); + checkWindow->setWindowModality(Qt::ApplicationModal); + checkWindow->show(); +} diff --git a/softwareDirectory/AutoVerScheme/newcheckmethod.h b/softwareDirectory/AutoVerScheme/newcheckmethod.h index e923401..8a26b0f 100644 --- a/softwareDirectory/AutoVerScheme/newcheckmethod.h +++ b/softwareDirectory/AutoVerScheme/newcheckmethod.h @@ -18,6 +18,7 @@ void showCheckDevice(); void choosePicture(); void deletePicture(); + void showCheckPoint(); private: Ui::NewCheckMethod *ui; diff --git a/softwareDirectory/AutoVerScheme/newcheckmethod.ui b/softwareDirectory/AutoVerScheme/newcheckmethod.ui index 516b62e..27a8951 100644 --- a/softwareDirectory/AutoVerScheme/newcheckmethod.ui +++ b/softwareDirectory/AutoVerScheme/newcheckmethod.ui @@ -567,8 +567,8 @@ showCheckDevice() - 1255 - 221 + 1304 + 257 1333 @@ -583,8 +583,8 @@ choosePicture() - 287 - 184 + 394 + 222 266 @@ -599,8 +599,8 @@ deletePicture() - 375 - 189 + 513 + 222 385 @@ -608,10 +608,27 @@ + + pushButton_8 + clicked() + NewCheckMethod + showCheckPoint() + + + 1280 + 753 + + + 1337 + 716 + + + showCheckDevice() choosePicture() deletePicture() + showCheckPoint() diff --git a/softwareDirectory/AutoVerScheme/newverifymethod.cpp b/softwareDirectory/AutoVerScheme/newverifymethod.cpp index e07a035..d3d5abd 100644 --- a/softwareDirectory/AutoVerScheme/newverifymethod.cpp +++ b/softwareDirectory/AutoVerScheme/newverifymethod.cpp @@ -1,6 +1,7 @@ #include "newverifymethod.h" #include "ui_newverifymethod.h" #include "verifydevice.h" +#include "formverypoint.h" NewVerifyMethod::NewVerifyMethod(QWidget *parent) : QWidget(parent), @@ -21,3 +22,11 @@ checkWindow->setWindowModality(Qt::ApplicationModal); checkWindow->show(); } + +void NewVerifyMethod::showVeryPoint() +{ + FormVeryPoint *checkWindow = new FormVeryPoint; + //checkWindow.setWindowState(Qt::WindowMaximized); + checkWindow->setWindowModality(Qt::ApplicationModal); + checkWindow->show(); +} diff --git a/softwareDirectory/AutoVerScheme/newverifymethod.h b/softwareDirectory/AutoVerScheme/newverifymethod.h index 46caeb4..1c262c0 100644 --- a/softwareDirectory/AutoVerScheme/newverifymethod.h +++ b/softwareDirectory/AutoVerScheme/newverifymethod.h @@ -16,6 +16,7 @@ ~NewVerifyMethod(); private slots: void showVerifyDevice(); + void showVeryPoint(); private: Ui::NewVerifyMethod *ui; }; diff --git a/softwareDirectory/AutoVerScheme/newverifymethod.ui b/softwareDirectory/AutoVerScheme/newverifymethod.ui index 9fa8239..32fd7e2 100644 --- a/softwareDirectory/AutoVerScheme/newverifymethod.ui +++ b/softwareDirectory/AutoVerScheme/newverifymethod.ui @@ -437,8 +437,25 @@ + + pushButton_14 + clicked() + NewVerifyMethod + showVeryPoint() + + + 1279 + 755 + + + 1338 + 754 + + + showVerifyDevice() + showVeryPoint() diff --git a/softwareDirectory/AutoVerScheme/verifydevice.cpp b/softwareDirectory/AutoVerScheme/verifydevice.cpp index 27fb42c..1a13c60 100644 --- a/softwareDirectory/AutoVerScheme/verifydevice.cpp +++ b/softwareDirectory/AutoVerScheme/verifydevice.cpp @@ -25,11 +25,6 @@ void VerifyDevice::getVerifyDevice() { - BaseCommonApi dbManager; - // 调用数据库管理器的函数获取数据 - - - int rowCount=0; int row=0; QList data = BaseCommonApi::getBizDeviceManage(); @@ -48,11 +43,6 @@ void VerifyDevice::getCheckDevice() { - - BaseCommonApi dbManager; - // 调用数据库管理器的函数获取数据 - - int rowCount=0; int row=0; QList data = BaseCommonApi::getBizDeviceManage(); diff --git a/softwareDirectory/AutoVerScheme/visacommonengine.cpp b/softwareDirectory/AutoVerScheme/visacommonengine.cpp index 53c742b..c9c00c7 100644 --- a/softwareDirectory/AutoVerScheme/visacommonengine.cpp +++ b/softwareDirectory/AutoVerScheme/visacommonengine.cpp @@ -84,3 +84,15 @@ { return ""; } + +bool VisaCommonEngine::sendData(QString strData) +{ + //strcpy(stringinput, strData.toLatin1().data()); + //strcpy(stringinput, "*IDN?\n"); + char *strBuf = strData.toLatin1().data(); + status = viWrite(instr, (ViBuf)strBuf, (ViUInt32)strlen(strBuf), &writeCount); + if (status < VI_SUCCESS){ + return false; + } + return true; +} diff --git a/softwareDirectory/AutoVerScheme/AutoVerScheme.pro b/softwareDirectory/AutoVerScheme/AutoVerScheme.pro index b7a7f10..4b3cb2b 100644 --- a/softwareDirectory/AutoVerScheme/AutoVerScheme.pro +++ b/softwareDirectory/AutoVerScheme/AutoVerScheme.pro @@ -31,6 +31,8 @@ depar_task.cpp \ depar_task_server.cpp \ dialogcheckresult.cpp \ + formcheckpoint.cpp \ + formverypoint.cpp \ indexwindow.cpp \ infomanageview.cpp \ inspectdataitem.cpp \ @@ -66,6 +68,8 @@ depar_task.h \ depar_task_server.h \ dialogcheckresult.h \ + formcheckpoint.h \ + formverypoint.h \ indexwindow.h \ infomanageview.h \ inspectdataitem.h \ @@ -94,6 +98,8 @@ datasyncview.ui \ depar_task.ui \ dialogcheckresult.ui \ + formcheckpoint.ui \ + formverypoint.ui \ indexwindow.ui \ infomanageview.ui \ inspectdataitem.ui \ diff --git a/softwareDirectory/AutoVerScheme/AutoVerScheme.pro.user b/softwareDirectory/AutoVerScheme/AutoVerScheme.pro.user index b379c65..c5290fc 100644 --- a/softwareDirectory/AutoVerScheme/AutoVerScheme.pro.user +++ b/softwareDirectory/AutoVerScheme/AutoVerScheme.pro.user @@ -1,10 +1,10 @@ - + EnvironmentId - {94e4c4a1-54d4-412c-b108-da01d63f0d97} + {2746248a-b112-4e0f-9ae0-9e61f2a42309} ProjectExplorer.Project.ActiveTarget @@ -55,23 +55,40 @@ ProjectExplorer.Project.PluginSettings + + true + true + true + true + + 0 + true -fno-delayed-template-parsing true + + true + Builtin.TidyAndClazy + 4 + + + + true + ProjectExplorer.Project.Target.0 - Desktop Qt 5.14.2 MinGW 32-bit - Desktop Qt 5.14.2 MinGW 32-bit - qt.qt5.5142.win32_mingw73_kit + 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:/work/code/BJJZ/svntest/softwareDirectory/build-AutoVerScheme-Desktop_Qt_5_14_2_MinGW_32_bit-Debug + D:/dev/software/softwareDirectory/build-AutoVerScheme-Desktop_Qt_5_14_2_MinGW_64_bit-Debug true @@ -119,7 +136,7 @@ 2 - D:/work/code/BJJZ/svntest/softwareDirectory/build-AutoVerScheme-Desktop_Qt_5_14_2_MinGW_32_bit-Release + D:/dev/software/softwareDirectory/build-AutoVerScheme-Desktop_Qt_5_14_2_MinGW_64_bit-Release true @@ -167,7 +184,7 @@ 0 - D:/work/code/BJJZ/svntest/softwareDirectory/build-AutoVerScheme-Desktop_Qt_5_14_2_MinGW_32_bit-Profile + D:/dev/software/softwareDirectory/build-AutoVerScheme-Desktop_Qt_5_14_2_MinGW_64_bit-Profile true @@ -287,8 +304,8 @@ 2 - Qt4ProjectManager.Qt4RunConfiguration:D:/work/code/BJJZ/svntest/softwareDirectory/AutoVerScheme/AutoVerScheme.pro - D:/work/code/BJJZ/svntest/softwareDirectory/AutoVerScheme/AutoVerScheme.pro + Qt4ProjectManager.Qt4RunConfiguration:D:/dev/software/softwareDirectory/AutoVerScheme/AutoVerScheme.pro + D:/dev/software/softwareDirectory/AutoVerScheme/AutoVerScheme.pro false @@ -299,7 +316,7 @@ false true - D:/work/code/BJJZ/svntest/softwareDirectory/build-AutoVerScheme-Desktop_Qt_5_14_2_MinGW_32_bit-Debug + D:/dev/software/softwareDirectory/build-AutoVerScheme-Desktop_Qt_5_14_2_MinGW_64_bit-Debug 1 @@ -307,14 +324,14 @@ ProjectExplorer.Project.Target.1 - Desktop Qt 5.14.2 MinGW 64-bit - Desktop Qt 5.14.2 MinGW 64-bit - qt.qt5.5142.win64_mingw73_kit + 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:/work/code/BJJZ/svntest/softwareDirectory/build-AutoVerScheme-Desktop_Qt_5_14_2_MinGW_64_bit-Debug + D:/dev/software/softwareDirectory/build-AutoVerScheme-Desktop_Qt_5_14_2_MinGW_32_bit-Debug true @@ -362,7 +379,7 @@ 2 - D:/work/code/BJJZ/svntest/softwareDirectory/build-AutoVerScheme-Desktop_Qt_5_14_2_MinGW_64_bit-Release + D:/dev/software/softwareDirectory/build-AutoVerScheme-Desktop_Qt_5_14_2_MinGW_32_bit-Release true @@ -410,7 +427,7 @@ 0 - D:/work/code/BJJZ/svntest/softwareDirectory/build-AutoVerScheme-Desktop_Qt_5_14_2_MinGW_64_bit-Profile + D:/dev/software/softwareDirectory/build-AutoVerScheme-Desktop_Qt_5_14_2_MinGW_32_bit-Profile true @@ -530,14 +547,14 @@ 2 - - ProjectExplorer.CustomExecutableRunConfiguration - + Qt4ProjectManager.Qt4RunConfiguration:D:/dev/software/softwareDirectory/AutoVerScheme/AutoVerScheme.pro + D:/dev/software/softwareDirectory/AutoVerScheme/AutoVerScheme.pro false false true + true false false true diff --git a/softwareDirectory/AutoVerScheme/AutoVerScheme.pro.user.94e4c4a b/softwareDirectory/AutoVerScheme/AutoVerScheme.pro.user.94e4c4a new file mode 100644 index 0000000..742ac25 --- /dev/null +++ b/softwareDirectory/AutoVerScheme/AutoVerScheme.pro.user.94e4c4a @@ -0,0 +1,562 @@ + + + + + + EnvironmentId + {94e4c4a1-54d4-412c-b108-da01d63f0d97} + + + 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 32-bit + Desktop Qt 5.14.2 MinGW 32-bit + qt.qt5.5142.win32_mingw73_kit + 0 + 0 + 0 + + D:/work/code/BJJZ/svntest/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:/work/code/BJJZ/svntest/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:/work/code/BJJZ/svntest/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:/work/code/BJJZ/svntest/softwareDirectory/AutoVerScheme/AutoVerScheme.pro + D:/work/code/BJJZ/svntest/softwareDirectory/AutoVerScheme/AutoVerScheme.pro + + false + + false + true + true + false + false + true + + D:/work/code/BJJZ/svntest/softwareDirectory/build-AutoVerScheme-Desktop_Qt_5_14_2_MinGW_32_bit-Debug + + 1 + + + + ProjectExplorer.Project.Target.1 + + 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:/work/code/BJJZ/svntest/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:/work/code/BJJZ/svntest/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:/work/code/BJJZ/svntest/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 + + + ProjectExplorer.CustomExecutableRunConfiguration + + + false + + false + true + false + false + true + + + + 1 + + + + ProjectExplorer.Project.TargetCount + 2 + + + ProjectExplorer.Project.Updater.FileVersion + 22 + + + Version + 22 + + diff --git a/softwareDirectory/AutoVerScheme/checkdevice.cpp b/softwareDirectory/AutoVerScheme/checkdevice.cpp index 5497af2..d540aa6 100644 --- a/softwareDirectory/AutoVerScheme/checkdevice.cpp +++ b/softwareDirectory/AutoVerScheme/checkdevice.cpp @@ -14,6 +14,7 @@ ui->tableWidget_4->setColumnWidth(0, 80); for(int i=1;i<5;i++) ui->tableWidget_4->horizontalHeader()->setSectionResizeMode(i,QHeaderView::Stretch); + getCheckDevice(); getStandardDevice(); } @@ -22,6 +23,23 @@ delete ui; } +void CheckDevice::getCheckDevice() +{ + int rowCount=0; + int row=0; + QList data = BaseCommonApi::getTestedDevice(); + for (const TestedDevice& bizDevice : data) { + rowCount = ui->tableWidget_3->rowCount(); + ui->tableWidget_3->insertRow(rowCount); + QCheckBox *checkBox = new QCheckBox; + ui->tableWidget_3->setCellWidget(row, 0, checkBox); + ui->tableWidget_4->setItem(row, 1, new QTableWidgetItem(bizDevice.equipment_name)); + ui->tableWidget_4->setItem(row, 2, new QTableWidgetItem(bizDevice.model)); + ui->tableWidget_4->setItem(row, 3, new QTableWidgetItem(bizDevice.help_instruction)); + row++; + } +} + void CheckDevice::getStandardDevice() { int rowCount=0; diff --git a/softwareDirectory/AutoVerScheme/checkdevice.h b/softwareDirectory/AutoVerScheme/checkdevice.h index fc42d90..8102d24 100644 --- a/softwareDirectory/AutoVerScheme/checkdevice.h +++ b/softwareDirectory/AutoVerScheme/checkdevice.h @@ -16,6 +16,7 @@ ~CheckDevice(); private: + void getCheckDevice(); void getStandardDevice(); private: diff --git a/softwareDirectory/AutoVerScheme/depar_task.cpp b/softwareDirectory/AutoVerScheme/depar_task.cpp index 5b5c3ef..ea7c6a2 100644 --- a/softwareDirectory/AutoVerScheme/depar_task.cpp +++ b/softwareDirectory/AutoVerScheme/depar_task.cpp @@ -97,7 +97,7 @@ ui->tableWidget->setItem(row, 5, new QTableWidgetItem(dept.manufacturer)); //设置数据 ui->tableWidget->setItem(row, 6, new QTableWidgetItem(dept.customer_name)); //设置数据 ui->tableWidget->setItem(row, 7, new QTableWidgetItem(dept.FULL_NAME)); //设置数据 - ui->tableWidget->setItem(row, 8, new QTableWidgetItem(dept.require_over_time)); //设置数据 + ui->tableWidget->setItem(row, 8, new QTableWidgetItem(dept.require_over_time.toString())); //设置数据 if(dept.is_urgent=="1") State="是"; else diff --git a/softwareDirectory/AutoVerScheme/formcheckpoint.cpp b/softwareDirectory/AutoVerScheme/formcheckpoint.cpp new file mode 100644 index 0000000..5ff2d74 --- /dev/null +++ b/softwareDirectory/AutoVerScheme/formcheckpoint.cpp @@ -0,0 +1,14 @@ +#include "formcheckpoint.h" +#include "ui_formcheckpoint.h" + +FormCheckPoint::FormCheckPoint(QWidget *parent) : + QWidget(parent), + ui(new Ui::FormCheckPoint) +{ + ui->setupUi(this); +} + +FormCheckPoint::~FormCheckPoint() +{ + delete ui; +} diff --git a/softwareDirectory/AutoVerScheme/formcheckpoint.h b/softwareDirectory/AutoVerScheme/formcheckpoint.h new file mode 100644 index 0000000..5f8ccf0 --- /dev/null +++ b/softwareDirectory/AutoVerScheme/formcheckpoint.h @@ -0,0 +1,22 @@ +#ifndef FORMCHECKPOINT_H +#define FORMCHECKPOINT_H + +#include + +namespace Ui { +class FormCheckPoint; +} + +class FormCheckPoint : public QWidget +{ + Q_OBJECT + +public: + explicit FormCheckPoint(QWidget *parent = nullptr); + ~FormCheckPoint(); + +private: + Ui::FormCheckPoint *ui; +}; + +#endif // FORMCHECKPOINT_H diff --git a/softwareDirectory/AutoVerScheme/formcheckpoint.ui b/softwareDirectory/AutoVerScheme/formcheckpoint.ui new file mode 100644 index 0000000..3a6eb47 --- /dev/null +++ b/softwareDirectory/AutoVerScheme/formcheckpoint.ui @@ -0,0 +1,168 @@ + + + FormCheckPoint + + + + 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); + + + + + + + 12 + 75 + true + + + + 检定项目及检定点 + + + + + + + + + + + + + + + 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/formverypoint.cpp b/softwareDirectory/AutoVerScheme/formverypoint.cpp new file mode 100644 index 0000000..d1cec57 --- /dev/null +++ b/softwareDirectory/AutoVerScheme/formverypoint.cpp @@ -0,0 +1,14 @@ +#include "formverypoint.h" +#include "ui_formverypoint.h" + +FormVeryPoint::FormVeryPoint(QWidget *parent) : + QWidget(parent), + ui(new Ui::FormVeryPoint) +{ + ui->setupUi(this); +} + +FormVeryPoint::~FormVeryPoint() +{ + delete ui; +} diff --git a/softwareDirectory/AutoVerScheme/formverypoint.h b/softwareDirectory/AutoVerScheme/formverypoint.h new file mode 100644 index 0000000..bb6555c --- /dev/null +++ b/softwareDirectory/AutoVerScheme/formverypoint.h @@ -0,0 +1,22 @@ +#ifndef FORMVERYPOINT_H +#define FORMVERYPOINT_H + +#include + +namespace Ui { +class FormVeryPoint; +} + +class FormVeryPoint : public QWidget +{ + Q_OBJECT + +public: + explicit FormVeryPoint(QWidget *parent = nullptr); + ~FormVeryPoint(); + +private: + Ui::FormVeryPoint *ui; +}; + +#endif // FORMVERYPOINT_H diff --git a/softwareDirectory/AutoVerScheme/formverypoint.ui b/softwareDirectory/AutoVerScheme/formverypoint.ui new file mode 100644 index 0000000..c7fbf84 --- /dev/null +++ b/softwareDirectory/AutoVerScheme/formverypoint.ui @@ -0,0 +1,168 @@ + + + FormVeryPoint + + + + 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); + + + + + + + 12 + 75 + true + + + + 核查项目及核查点 + + + + + + + + + + + + + + + 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/my_task.cpp b/softwareDirectory/AutoVerScheme/my_task.cpp index 8d7abf7..fb72684 100644 --- a/softwareDirectory/AutoVerScheme/my_task.cpp +++ b/softwareDirectory/AutoVerScheme/my_task.cpp @@ -89,7 +89,7 @@ ui->tableWidget->setItem(row, 5, new QTableWidgetItem(myTask.manufacturer)); //设置数据 ui->tableWidget->setItem(row, 6, new QTableWidgetItem(myTask.customer_name)); //设置数据 ui->tableWidget->setItem(row, 7, new QTableWidgetItem(myTask.FULL_NAME)); //设置数据 - ui->tableWidget->setItem(row, 8, new QTableWidgetItem(myTask.require_over_time)); //设置数据 + ui->tableWidget->setItem(row, 8, new QTableWidgetItem(myTask.require_over_time.toString())); //设置数据 if(myTask.is_urgent=="1") State="是"; else diff --git a/softwareDirectory/AutoVerScheme/newcheckmethod.cpp b/softwareDirectory/AutoVerScheme/newcheckmethod.cpp index 9f0160a..eee7e48 100644 --- a/softwareDirectory/AutoVerScheme/newcheckmethod.cpp +++ b/softwareDirectory/AutoVerScheme/newcheckmethod.cpp @@ -2,6 +2,7 @@ #include "ui_newcheckmethod.h" #include "checkdevice.h" #include "qfiledialog.h" +#include "formcheckpoint.h" NewCheckMethod::NewCheckMethod(QWidget *parent) : QWidget(parent), @@ -40,3 +41,11 @@ { ui->label_11->clear(); } + +void NewCheckMethod::showCheckPoint() +{ + FormCheckPoint *checkWindow = new FormCheckPoint; + //checkWindow.setWindowState(Qt::WindowMaximized); + checkWindow->setWindowModality(Qt::ApplicationModal); + checkWindow->show(); +} diff --git a/softwareDirectory/AutoVerScheme/newcheckmethod.h b/softwareDirectory/AutoVerScheme/newcheckmethod.h index e923401..8a26b0f 100644 --- a/softwareDirectory/AutoVerScheme/newcheckmethod.h +++ b/softwareDirectory/AutoVerScheme/newcheckmethod.h @@ -18,6 +18,7 @@ void showCheckDevice(); void choosePicture(); void deletePicture(); + void showCheckPoint(); private: Ui::NewCheckMethod *ui; diff --git a/softwareDirectory/AutoVerScheme/newcheckmethod.ui b/softwareDirectory/AutoVerScheme/newcheckmethod.ui index 516b62e..27a8951 100644 --- a/softwareDirectory/AutoVerScheme/newcheckmethod.ui +++ b/softwareDirectory/AutoVerScheme/newcheckmethod.ui @@ -567,8 +567,8 @@ showCheckDevice() - 1255 - 221 + 1304 + 257 1333 @@ -583,8 +583,8 @@ choosePicture() - 287 - 184 + 394 + 222 266 @@ -599,8 +599,8 @@ deletePicture() - 375 - 189 + 513 + 222 385 @@ -608,10 +608,27 @@ + + pushButton_8 + clicked() + NewCheckMethod + showCheckPoint() + + + 1280 + 753 + + + 1337 + 716 + + + showCheckDevice() choosePicture() deletePicture() + showCheckPoint() diff --git a/softwareDirectory/AutoVerScheme/newverifymethod.cpp b/softwareDirectory/AutoVerScheme/newverifymethod.cpp index e07a035..d3d5abd 100644 --- a/softwareDirectory/AutoVerScheme/newverifymethod.cpp +++ b/softwareDirectory/AutoVerScheme/newverifymethod.cpp @@ -1,6 +1,7 @@ #include "newverifymethod.h" #include "ui_newverifymethod.h" #include "verifydevice.h" +#include "formverypoint.h" NewVerifyMethod::NewVerifyMethod(QWidget *parent) : QWidget(parent), @@ -21,3 +22,11 @@ checkWindow->setWindowModality(Qt::ApplicationModal); checkWindow->show(); } + +void NewVerifyMethod::showVeryPoint() +{ + FormVeryPoint *checkWindow = new FormVeryPoint; + //checkWindow.setWindowState(Qt::WindowMaximized); + checkWindow->setWindowModality(Qt::ApplicationModal); + checkWindow->show(); +} diff --git a/softwareDirectory/AutoVerScheme/newverifymethod.h b/softwareDirectory/AutoVerScheme/newverifymethod.h index 46caeb4..1c262c0 100644 --- a/softwareDirectory/AutoVerScheme/newverifymethod.h +++ b/softwareDirectory/AutoVerScheme/newverifymethod.h @@ -16,6 +16,7 @@ ~NewVerifyMethod(); private slots: void showVerifyDevice(); + void showVeryPoint(); private: Ui::NewVerifyMethod *ui; }; diff --git a/softwareDirectory/AutoVerScheme/newverifymethod.ui b/softwareDirectory/AutoVerScheme/newverifymethod.ui index 9fa8239..32fd7e2 100644 --- a/softwareDirectory/AutoVerScheme/newverifymethod.ui +++ b/softwareDirectory/AutoVerScheme/newverifymethod.ui @@ -437,8 +437,25 @@ + + pushButton_14 + clicked() + NewVerifyMethod + showVeryPoint() + + + 1279 + 755 + + + 1338 + 754 + + + showVerifyDevice() + showVeryPoint() diff --git a/softwareDirectory/AutoVerScheme/verifydevice.cpp b/softwareDirectory/AutoVerScheme/verifydevice.cpp index 27fb42c..1a13c60 100644 --- a/softwareDirectory/AutoVerScheme/verifydevice.cpp +++ b/softwareDirectory/AutoVerScheme/verifydevice.cpp @@ -25,11 +25,6 @@ void VerifyDevice::getVerifyDevice() { - BaseCommonApi dbManager; - // 调用数据库管理器的函数获取数据 - - - int rowCount=0; int row=0; QList data = BaseCommonApi::getBizDeviceManage(); @@ -48,11 +43,6 @@ void VerifyDevice::getCheckDevice() { - - BaseCommonApi dbManager; - // 调用数据库管理器的函数获取数据 - - int rowCount=0; int row=0; QList data = BaseCommonApi::getBizDeviceManage(); diff --git a/softwareDirectory/AutoVerScheme/visacommonengine.cpp b/softwareDirectory/AutoVerScheme/visacommonengine.cpp index 53c742b..c9c00c7 100644 --- a/softwareDirectory/AutoVerScheme/visacommonengine.cpp +++ b/softwareDirectory/AutoVerScheme/visacommonengine.cpp @@ -84,3 +84,15 @@ { return ""; } + +bool VisaCommonEngine::sendData(QString strData) +{ + //strcpy(stringinput, strData.toLatin1().data()); + //strcpy(stringinput, "*IDN?\n"); + char *strBuf = strData.toLatin1().data(); + status = viWrite(instr, (ViBuf)strBuf, (ViUInt32)strlen(strBuf), &writeCount); + if (status < VI_SUCCESS){ + return false; + } + return true; +} diff --git a/softwareDirectory/AutoVerScheme/visacommonengine.h b/softwareDirectory/AutoVerScheme/visacommonengine.h index 749f62a..937f7b6 100644 --- a/softwareDirectory/AutoVerScheme/visacommonengine.h +++ b/softwareDirectory/AutoVerScheme/visacommonengine.h @@ -8,6 +8,7 @@ public: VisaCommonEngine(); QString queryData(); + bool sendData(QString strData); private: bool openDevice(); private: