From 242a897d221e947fd987f41821e9b10c198af548 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=9C=E6=B5=B7=E9=B9=8F?= <952581343@qq.com> Date: Thu, 9 Jun 2022 12:55:22 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E4=BA=BA=E5=91=98?= =?UTF-8?q?=E5=9F=B9=E8=AE=AD=E5=88=97=E8=A1=A8=E9=A1=B5=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- package-lock.json | 22 +- src/assets/js/api/laborPerson.js | 3 + src/assets/js/http.js | 4 +- src/router/index.js | 5 + .../laborManage/safeeducation/data.js | 24 ++ .../laborManage/safeeducation/index.vue | 307 ++++++++++++++++++ 6 files changed, 343 insertions(+), 22 deletions(-) create mode 100644 src/views/projectFront/laborManage/safeeducation/data.js create mode 100644 src/views/projectFront/laborManage/safeeducation/index.vue diff --git a/package-lock.json b/package-lock.json index e0e6f843..1bbfff3c 100644 --- a/package-lock.json +++ b/package-lock.json @@ -5,6 +5,7 @@ "requires": true, "packages": { "": { + "name": "zhgdyun", "version": "0.1.0", "dependencies": { "axios": "^0.19.2", @@ -2213,7 +2214,6 @@ "merge-source-map": "^1.1.0", "postcss": "^7.0.14", "postcss-selector-parser": "^6.0.2", - "prettier": "^1.18.2", "source-map": "~0.6.1", "vue-template-es2015-compiler": "^1.9.0" }, @@ -4729,7 +4729,6 @@ "dependencies": { "anymatch": "~3.1.1", "braces": "~3.0.2", - "fsevents": "~2.1.2", "glob-parent": "~5.1.0", "is-binary-path": "~2.1.0", "is-glob": "~4.0.1", @@ -9588,9 +9587,6 @@ "resolved": "https://registry.npm.taobao.org/jsonfile/download/jsonfile-4.0.0.tgz", "integrity": "sha1-h3Gq4HmbZAdrdmQPygWPnBDjPss=", "dev": true, - "dependencies": { - "graceful-fs": "^4.1.6" - }, "optionalDependencies": { "graceful-fs": "^4.1.6" } @@ -9666,13 +9662,6 @@ "integrity": "sha1-FX5t0ypohp34hZMUrTjnAhGvOrQ=", "dev": true, "dependencies": { - "errno": "^0.1.1", - "graceful-fs": "^4.1.2", - "image-size": "~0.5.0", - "make-dir": "^2.1.0", - "mime": "^1.4.1", - "native-request": "^1.0.5", - "source-map": "~0.6.0", "tslib": "^1.10.0" }, "bin": { @@ -10531,7 +10520,6 @@ "resolved": "https://registry.npmjs.org/minipass-fetch/-/minipass-fetch-1.4.1.tgz", "integrity": "sha512-CGH1eblLq26Y15+Azk7ey4xh0J/XfJfrCox5LDJiKqI2Q2iwOLOKrlmIaODiSQS8d18jalF6y2K2ePUm0CmShw==", "dependencies": { - "encoding": "^0.1.12", "minipass": "^3.1.0", "minipass-sized": "^1.0.3", "minizlib": "^2.0.0" @@ -17143,7 +17131,6 @@ "anymatch": "^2.0.0", "async-each": "^1.0.1", "braces": "^2.3.2", - "fsevents": "^1.2.7", "glob-parent": "^3.1.0", "inherits": "^2.0.3", "is-binary-path": "^1.0.0", @@ -18513,7 +18500,6 @@ "integrity": "sha1-KcVzMUgFe7Th913zW3qcty5qWd0=", "dependencies": { "source-map": "~0.5.1", - "uglify-to-browserify": "~1.0.0", "yargs": "~3.10.0" }, "bin": { @@ -19135,10 +19121,8 @@ "resolved": "https://registry.npm.taobao.org/watchpack/download/watchpack-1.7.4.tgz?cache=0&sync_timestamp=1595633550112&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fwatchpack%2Fdownload%2Fwatchpack-1.7.4.tgz", "integrity": "sha1-bp2lOzyAuy1lCBiPWyAEEIZs0ws=", "dependencies": { - "chokidar": "^3.4.1", "graceful-fs": "^4.1.2", - "neo-async": "^2.5.0", - "watchpack-chokidar2": "^2.0.0" + "neo-async": "^2.5.0" }, "optionalDependencies": { "chokidar": "^3.4.1", @@ -19198,7 +19182,6 @@ "anymatch": "^2.0.0", "async-each": "^1.0.1", "braces": "^2.3.2", - "fsevents": "^1.2.7", "glob-parent": "^3.1.0", "inherits": "^2.0.3", "is-binary-path": "^1.0.0", @@ -19515,7 +19498,6 @@ "anymatch": "^2.0.0", "async-each": "^1.0.1", "braces": "^2.3.2", - "fsevents": "^1.2.7", "glob-parent": "^3.1.0", "inherits": "^2.0.3", "is-binary-path": "^1.0.0", diff --git a/src/assets/js/api/laborPerson.js b/src/assets/js/api/laborPerson.js index b4fc28e4..8ba46a8c 100644 --- a/src/assets/js/api/laborPerson.js +++ b/src/assets/js/api/laborPerson.js @@ -84,6 +84,9 @@ export const workerSafeEducationDeleteApi = data => post('xmgl/workerSafeEducati export const workerSafeEducationDetailApi = data => post('xmgl/workerSafeEducation/queryById', data); export const workerSafeEducationDetailApi2 = data => post('xmgl/workerSafeEducation/selectAnswerWorkerPage', data); +//项目下人员安全教育记录 +export const selectSafeEducationWorkerPageApi = data => post('xmgl/workerSafeEducationWorker/selectSafeEducationWorkerPage', data); + //黑名单管理 export const workerBlacklistListApi = data => post('xmgl/workerBlacklist/list', data); diff --git a/src/assets/js/http.js b/src/assets/js/http.js index 4d86f7bc..33c0da22 100644 --- a/src/assets/js/http.js +++ b/src/assets/js/http.js @@ -37,9 +37,9 @@ if (process.env.NODE_ENV == 'development') { // axios.defaults.baseURL = 'https://zhgd-uat.logan.com.cn/' // axios.defaults.baseURL = 'http://36.137.53.203:9090/'; // 南昌地铁 17512009894 123456789 gdjt 123456789 - axios.defaults.baseURL = 'http://124.71.178.44:100/' + // axios.defaults.baseURL = 'http://124.71.178.44:100/' // tag: 本地 - // axios.defaults.baseURL = 'http://192.168.34.125:6023/'; //本地 http/1.1 + axios.defaults.baseURL = 'http://192.168.34.125:6023/'; //本地 http/1.1 // axios.defaults.baseURL = 'http://182.90.224.237:7000/'; // 广西 diff --git a/src/router/index.js b/src/router/index.js index ab14de99..3c0a76ae 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -284,6 +284,11 @@ const routes2 = [{ name: '劳务管理_安全培训管理', component: () => import('@/views/projectFront/laborManage/safetyTrainManage.vue'), }, + { + path: '/project/labor/safeeducation', + name: '劳务管理_人员安全培训记录', + component: () => import('@/views/projectFront/laborManage/safeeducation/index.vue'), + }, { path: '/project/labor/blackList', name: '劳务管理_黑名单管理', diff --git a/src/views/projectFront/laborManage/safeeducation/data.js b/src/views/projectFront/laborManage/safeeducation/data.js new file mode 100644 index 00000000..a699d3ff --- /dev/null +++ b/src/views/projectFront/laborManage/safeeducation/data.js @@ -0,0 +1,24 @@ +// 人员类型选项 +export const personTypeOptions = [ + { + label: '全部', + value: "", + }, + { + label: '培训学校培训', + value: 0, + }, + { + label: '入场三级教育', + value: 1, + }, { + label: '定期安全教育', + value: 2, + }, { + label: '安全技术交底', + value: 3, + }, { + label: 'VR安全教育', + value: 4, + } +] diff --git a/src/views/projectFront/laborManage/safeeducation/index.vue b/src/views/projectFront/laborManage/safeeducation/index.vue new file mode 100644 index 00000000..98955db7 --- /dev/null +++ b/src/views/projectFront/laborManage/safeeducation/index.vue @@ -0,0 +1,307 @@ +/* 人员培训记录 */ + + + + + \ No newline at end of file From fa3b9b9e32746a6ba385cad53a52fe330bebddd3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=9C=E6=B5=B7=E9=B9=8F?= <952581343@qq.com> Date: Thu, 9 Jun 2022 13:20:13 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E5=88=97=E8=A1=A8=E5=AE=8C=E6=88=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../laborManage/safeeducation/index.vue | 158 ++++++------------ 1 file changed, 47 insertions(+), 111 deletions(-) diff --git a/src/views/projectFront/laborManage/safeeducation/index.vue b/src/views/projectFront/laborManage/safeeducation/index.vue index 98955db7..0c8a8610 100644 --- a/src/views/projectFront/laborManage/safeeducation/index.vue +++ b/src/views/projectFront/laborManage/safeeducation/index.vue @@ -2,9 +2,9 @@