diff --git a/public/js/config.js b/public/js/config.js index 9b3de141..e7fb5161 100644 --- a/public/js/config.js +++ b/public/js/config.js @@ -1,4 +1,4 @@ -// var COMPANY = ''; //通用 +var COMPANY = ''; //通用 // var COMPANY='zhongjian'; //中建,和沃尔对接的插件版用这个企业 // var COMPANY='hezhan'; //合展-宿迁 // var COMPANY='nanchang'; //南昌地铁、衢州 @@ -7,7 +7,7 @@ // var COMPANY='shenbai'; //沈白高铁 // COMPANY = 'henan' // 河南春笋 // COMPANY = 'xingxuan' -COMPANY = 'hengtong'//瑞士恒通 +// COMPANY = 'hengtong'//瑞士恒通 @@ -20,7 +20,7 @@ var PROJECT = { } -var PROJECT_TYPE = PROJECT.online_zjsj +var PROJECT_TYPE = PROJECT.local_test var headerShow = true; // 是否显示头部 var tabsShow = true; // 是否显示tabs diff --git a/src/assets/images/aqjy.png b/src/assets/images/aqjy.png new file mode 100644 index 00000000..68ea7c88 Binary files /dev/null and b/src/assets/images/aqjy.png differ diff --git a/src/assets/js/api/safeManage.js b/src/assets/js/api/safeManage.js index 7077501e..c702d515 100644 --- a/src/assets/js/api/safeManage.js +++ b/src/assets/js/api/safeManage.js @@ -61,4 +61,15 @@ export const getselectHiddenDangerRectifyRecordListApi = data => post('xmgl/hidd export const addHiddenDangerRectifyRecordApi = data => post('xmgl/hiddenDangerRectifyRecord/add', data); //隐患考核列表 -export const getSelectEnterpriseScoreList = data => post('xmgl/hiddenDangerInspectRecord/selectEnterpriseScoreList', data); \ No newline at end of file +export const getSelectEnterpriseScoreList = data => post('xmgl/hiddenDangerInspectRecord/selectEnterpriseScoreList', data); + + +//验证身份证 +export const getAnswerWorkerInfoList = data => post('xmgl/safeEducationQuestionAnswer/getAnswerWorkerInfo', data); + +//获取课程详细数据 +export const getSelectSafeEducationQuestionInfoList = data => post('xmgl/safeEducationQuestion/selectSafeEducationQuestionInfo', data); + + +//考试成功 +export const addSafeEducationQuestionAnswer = data => post('xmgl/safeEducationQuestionAnswer/add', data); \ No newline at end of file diff --git a/src/router/index.js b/src/router/index.js index 2fe8d306..0e4a1a18 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -1277,8 +1277,26 @@ const routes2 = [ component: resolve => require(['@/views/projectFront/informatioBroadcast/broadcast.vue'], resolve) }, - ] + ], }, + //扫二维码路由 + { + path: '/authentication', + name: '安全教育_考试', + component: () => import('@/views/projectFront/examination/authentication.vue') + }, + { + path: '/test', + name: '安全教育_考试提示', + component: () => import('@/views/projectFront/examination/test.vue') + }, + { + path: '/videoLearning', + name: '安全教育_考试视频', + component: () => import('@/views/projectFront/examination/videoLearning.vue') + }, + + //企业后台 { path: '/page', diff --git a/src/views/projectFront/examination/authentication.vue b/src/views/projectFront/examination/authentication.vue new file mode 100644 index 00000000..fb81671c --- /dev/null +++ b/src/views/projectFront/examination/authentication.vue @@ -0,0 +1,107 @@ + + + + + diff --git a/src/views/projectFront/examination/dialog.vue b/src/views/projectFront/examination/dialog.vue new file mode 100644 index 00000000..d46a7058 --- /dev/null +++ b/src/views/projectFront/examination/dialog.vue @@ -0,0 +1,80 @@ + + + + + diff --git a/src/views/projectFront/examination/test.vue b/src/views/projectFront/examination/test.vue new file mode 100644 index 00000000..b0a40ff5 --- /dev/null +++ b/src/views/projectFront/examination/test.vue @@ -0,0 +1,344 @@ + + + + + diff --git a/src/views/projectFront/examination/videoLearning.vue b/src/views/projectFront/examination/videoLearning.vue new file mode 100644 index 00000000..6a22a818 --- /dev/null +++ b/src/views/projectFront/examination/videoLearning.vue @@ -0,0 +1,130 @@ + + + + + diff --git a/src/views/projectFront/safetyEducation/addCourse.vue b/src/views/projectFront/safetyEducation/addCourse.vue index d366282c..14782903 100644 --- a/src/views/projectFront/safetyEducation/addCourse.vue +++ b/src/views/projectFront/safetyEducation/addCourse.vue @@ -640,18 +640,16 @@ export default { createQRcode(index) { console.log('扫码进来了吗====1', index) if (this.$route.path.indexOf('/project/') != -1) { - console.log('扫码进来了吗====2') - - let url = '' - if (process.env.NODE_ENV == 'development') { - url = 'http://182.90.224.147:18170/' - } else { - url = window.location.origin + '/' - } + // let url = '' + // if (process.env.NODE_ENV == 'development') { + // url = 'http://182.90.224.147:18170/' + // } else { + let url = window.location.origin + // } console.log( '扫码进来了吗====3 :' + (url + - '#/pages/projectEnd/safetyEducation/authentication?eduId=' + + '#/authentication?eduId=' + this.eduId + '&projectSn=' + this.$store.state.projectSn) @@ -667,7 +665,7 @@ export default { height: height, // 高度 text: url + - '#/pages/projectEnd/safetyEducation/authentication?eduId=' + + '/authentication?eduId=' + this.eduId + '&projectSn=' + this.$store.state.projectSn, // 二维码内容