diff --git a/src/assets/i18n/langs/cn/laborManage/laborDev.js b/src/assets/i18n/langs/cn/laborManage/laborDev.js index c19244d9..710aa443 100644 --- a/src/assets/i18n/langs/cn/laborManage/laborDev.js +++ b/src/assets/i18n/langs/cn/laborManage/laborDev.js @@ -52,6 +52,7 @@ export default { remarks:'备注', educateTypeList:['入场三级教育','定期安全教育','安全技术交底','VR安全教育'], signInInfo:'签到信息', + photo:'培训照片', selectWorker: '选择工人', allGroup:'全部班组', allCompany:'全部企业', diff --git a/src/assets/js/http.js b/src/assets/js/http.js index 767c31e6..f0a0fe28 100644 --- a/src/assets/js/http.js +++ b/src/assets/js/http.js @@ -39,7 +39,8 @@ if (process.env.NODE_ENV == 'development') { // 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/' + axios.defaults.baseURL = 'http://192.168.34.125:6033/' // tag: 本地 // axios.defaults.baseURL = 'http://192.168.88.220:6023/'; //本地 http/1.1 // axios.defaults.baseURL = 'http://124.71.178.44:9500/'; // 星璇 diff --git a/src/store/index.js b/src/store/index.js index 151aa154..bcb1b46b 100644 --- a/src/store/index.js +++ b/src/store/index.js @@ -45,16 +45,16 @@ 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/',//测试 + // UPLOADURL: window.location.protocol + '//' + window.location.host + '/upload/image', // + // FILEURL: window.location.protocol + '//' + window.location.host + '/image/',//测试 /* 2022-05-16 */ // tag: 部署河南项目时,需要打开这两行代码 // UPLOADURL: 'http://124.71.178.44:100/upload/image', // FILEURL: 'http://124.71.178.44:100/image/', /* 2022-06-06 */ // tag: 本地测试接口 - // UPLOADURL: 'http://192.168.34.125:6023/upload/image', - // FILEURL: 'http://192.168.34.125:6023/image/', + UPLOADURL: 'http://192.168.34.125:6033/upload/image', + FILEURL: 'http://192.168.34.125:6033/image/', // UPLOADURL:'http://'+"61.190.32.219:9050"+'/upload/image',//正式 // FILEURL:'http://'+"61.190.32.219:9050"+'/image/',//正式 ACCOUNTTYPE: ['系统管理员', '企业一级管理员', '企业二级管理员', '企业三级管理员', '项目管理员'], //1系统管理员,2企业管理员账号,3企业区账号,4企业市账号,5项目账号 diff --git a/src/views/projectFront/laborManage/safetyTrainManage.vue b/src/views/projectFront/laborManage/safetyTrainManage.vue index f2671d06..9fe3fdf2 100644 --- a/src/views/projectFront/laborManage/safetyTrainManage.vue +++ b/src/views/projectFront/laborManage/safetyTrainManage.vue @@ -244,6 +244,23 @@ 材料上传 + + +
+ + + + 培训{{i === 1 ? '前' : i === 2 ? '中' : '后'}} + +
+
{{ $t("message.personnelPosition.cancel") }} + {{ $t("message.personnelPosition.determine") }} + @@ -697,4 +716,34 @@ export default { left: 50%; transform: translate(-50%, -50%); } + +.form-photo{ + display: flex; + flex-wrap: wrap; + .photoUpload{ + margin-right: 10px; + } +} + +/deep/.photoUpload .el-upload { + position: relative; + width: 80px; + height: 80px; + border: 1px dashed #d9d9d9; + border-radius: 6px; + overflow: hidden; + cursor: pointer; + span{ + position: relative; + bottom: 36px; + } +} +.avatar-uploader-icon { + font-size: 20px; + color: #8c939d; + width: 80px; + height: 80px; + line-height: 80px; + text-align: center; +}