diff --git a/public/js/config.js b/public/js/config.js index d9fb0f68..7f7c6f90 100644 --- a/public/js/config.js +++ b/public/js/config.js @@ -14,10 +14,11 @@ var PROJECT = { local_test: 'common', // 普通版 online_hq: 'hengqin', // 横琴 online_zjsj: 'zjsj', // 中建四局 + online_gxlt: 'gxlt', // 中建四局 } -var PROJECT_TYPE = PROJECT.local_test +var PROJECT_TYPE = PROJECT.online_zjsj var headerShow = true; // 是否显示头部 var tabsShow = true; // 是否显示tabs diff --git a/src/assets/i18n/langs/cn/laborManage/laborDev.js b/src/assets/i18n/langs/cn/laborManage/laborDev.js index 3d840885..a8781628 100644 --- a/src/assets/i18n/langs/cn/laborManage/laborDev.js +++ b/src/assets/i18n/langs/cn/laborManage/laborDev.js @@ -61,6 +61,18 @@ export default { '每日交底(安全技术交底)', '每日交底(大工程交底)', ], + educateTypeList2:[ + '入场安全教育', + '日常安全教育', + '每日安全交底', + 'VR安全教育', + '班前教育', + '日常教育(日常违规教育)', + '每日交底(专项方案交底)', + '每日交底(安全技术交底)', + '每日交底(大工程交底)', + '入职培训' + ], signInInfo:'签到信息', trainVideo:'教学视频上传', photo:'培训照片', diff --git a/src/components/videoModule/isc_plugin/video_isc_plugin.js b/src/components/videoModule/isc_plugin/video_isc_plugin.js index 108df2c7..9dd21eef 100644 --- a/src/components/videoModule/isc_plugin/video_isc_plugin.js +++ b/src/components/videoModule/isc_plugin/video_isc_plugin.js @@ -382,7 +382,7 @@ function getPubKey(callback) { // 监听滚动条 window.addEventListener('scroll', () => { - console.log('滚动条') + // console.log('滚动条') if(oWebControl != null){ width = document.getElementById('videoOverview').offsetWidth-20 height = document.getElementById('videoOverview').offsetHeight-18 diff --git a/src/store/index.js b/src/store/index.js index f03d839a..ec69a772 100644 --- a/src/store/index.js +++ b/src/store/index.js @@ -45,8 +45,8 @@ export default new Vuex.Store({ // UPLOADURL:'http://10.0.1.43:6023/upload/image',//测试 // FILEURL:'http://10.0.1.43:6023/image/',//测试 BASEURL: baseUrl ? baseUrl : window.location.protocol + '//' + window.location.host + '/', // - UPLOADURL: window.location.protocol + '//' + window.location.host + '/upload/image', // - FILEURL: window.location.protocol + '//' + window.location.host + '/image/', //测试 // tag: 本地测试接口 + // UPLOADURL: window.location.protocol + '//' + window.location.host + '/upload/image', // + // FILEURL: window.location.protocol + '//' + window.location.host + '/image/', //测试 // tag: 本地测试接口 /* 2022-05-16 */ // tag: 部署河南项目时,需要打开这两行代码 // UPLOADURL: 'http://124.71.178.44:100/upload/image', @@ -56,8 +56,8 @@ export default new Vuex.Store({ // UPLOADURL: 'http://182.90.224.237:7000/upload/image', // FILEURL: 'http://182.90.224.237:7000/image/', // 邱平毅的 - // UPLOADURL: 'http://192.168.34.216:6023/upload/image', - // FILEURL: 'http://192.168.34.216:6023/image/', + UPLOADURL: 'http://192.168.34.216:6023/upload/image', + FILEURL: 'http://192.168.34.216:6023/image/', // UPLOADURL:'http://'+"61.190.32.219:9050"+'/upload/image',//正式 // FILEURL:'http://'+"61.190.32.219:9050"+'/image/',//正式 diff --git a/src/views/projectFront/laborManage/safetyTrainManage.vue b/src/views/projectFront/laborManage/safetyTrainManage.vue index c605f304..84ffd1c1 100644 --- a/src/views/projectFront/laborManage/safetyTrainManage.vue +++ b/src/views/projectFront/laborManage/safetyTrainManage.vue @@ -577,10 +577,18 @@ export default { isAdd: false, allPersonList: [], educateTypeList: this.$t("message.laborDev.educateTypeList"), + projectType: "", selectWorkerDialog: false, detailDialog: false, }; }, + created(){ + this.projectType = PROJECT_TYPE; + if(this.projectType == "zjsj"){ + this.educateTypeList = this.$t("message.laborDev.educateTypeList2") + } + + }, mounted() { this.loadAllPerson(); this.loadCardData();