From ce54b6fd29619613630efb4fc5896eaa96440569 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, 14 Jul 2022 10:55:30 +0800 Subject: [PATCH 1/6] =?UTF-8?q?=E5=AE=89=E5=85=A8=E5=9F=B9=E8=AE=AD?= =?UTF-8?q?=E7=AE=A1=E7=90=86=EF=BC=9A=E6=9B=B4=E6=94=B9=E7=BC=96=E8=BE=91?= =?UTF-8?q?=E5=BC=B9=E6=A1=86=EF=BC=8C=E6=B7=BB=E5=8A=A0=E5=9F=B9=E8=AE=AD?= =?UTF-8?q?=E7=85=A7=E7=89=87=E8=A1=A8=E5=8D=95=E9=A1=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i18n/langs/cn/laborManage/laborDev.js | 1 + src/assets/js/http.js | 3 +- src/store/index.js | 8 +-- .../laborManage/safetyTrainManage.vue | 49 +++++++++++++++++++ 4 files changed, 56 insertions(+), 5 deletions(-) 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; +} From 70391446e54fe0ed9871ff023dfe88de47fb46b0 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, 14 Jul 2022 11:26:24 +0800 Subject: [PATCH 2/6] =?UTF-8?q?=E5=AE=89=E5=85=A8=E5=9F=B9=E8=AE=AD?= =?UTF-8?q?=E7=AE=A1=E7=90=86=EF=BC=9A=E5=AE=8C=E6=88=90=E7=BC=96=E8=BE=91?= =?UTF-8?q?=E5=BC=B9=E6=A1=86=EF=BC=8C=E5=9F=B9=E8=AE=AD=E7=85=A7=E7=89=87?= =?UTF-8?q?=E4=B8=8A=E4=BC=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../laborManage/safetyTrainManage.vue | 24 +++++++++++++++---- 1 file changed, 20 insertions(+), 4 deletions(-) diff --git a/src/views/projectFront/laborManage/safetyTrainManage.vue b/src/views/projectFront/laborManage/safetyTrainManage.vue index 9fe3fdf2..8aadbfb9 100644 --- a/src/views/projectFront/laborManage/safetyTrainManage.vue +++ b/src/views/projectFront/laborManage/safetyTrainManage.vue @@ -253,11 +253,13 @@ class="photoUpload" :action="$store.state.UPLOADURL" :show-file-list="false" - :on-success="handleAvatarSuccess" + :on-success="file => handleUpload(file, i)" :before-upload="beforeAvatarUpload"> - - - 培训{{i === 1 ? '前' : i === 2 ? '中' : '后'}} + + @@ -458,6 +460,11 @@ export default { allPersonList: [], educateTypeList: this.$t("message.laborDev.educateTypeList"), selectWorkerDialog: false, + eduPhotos: { + photo1: '', + photo2: '', + photo3: '', + } }; }, mounted() { @@ -467,6 +474,11 @@ export default { console.log('url',xxx) }, methods: { + handleUpload(res, num) { + const imageUrl = res.data[0].imageUrl + this.eduPhotos['photo' + num] = imageUrl + console.log(this.eduPhoto1,this.eduPhoto2,this.eduPhoto3, num); + }, handlePreview(file,type){ // console.log('file',file) // console.log('fileList',type) @@ -722,6 +734,10 @@ export default { flex-wrap: wrap; .photoUpload{ margin-right: 10px; + .photo{ + width: 100%; + height: 100%; + } } } From a4cfd15bfd0958570b40015ddd7138e6cdbe7463 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, 14 Jul 2022 16:22:11 +0800 Subject: [PATCH 3/6] =?UTF-8?q?=E5=AE=89=E5=85=A8=E5=9F=B9=E8=AE=AD?= =?UTF-8?q?=E7=AE=A1=E7=90=86=EF=BC=9A=E6=96=B0=E5=A2=9E=E5=9F=B9=E8=AE=AD?= =?UTF-8?q?=E6=97=B6=E9=97=B4=E8=A1=A8=E5=8D=95=E9=A1=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i18n/langs/cn/laborManage/laborDev.js | 1 + src/assets/js/http.js | 2 +- src/store/index.js | 4 +- .../laborManage/safetyTrainManage.vue | 56 ++++++++++++++++--- 4 files changed, 51 insertions(+), 12 deletions(-) diff --git a/src/assets/i18n/langs/cn/laborManage/laborDev.js b/src/assets/i18n/langs/cn/laborManage/laborDev.js index 710aa443..8f0a8808 100644 --- a/src/assets/i18n/langs/cn/laborManage/laborDev.js +++ b/src/assets/i18n/langs/cn/laborManage/laborDev.js @@ -53,6 +53,7 @@ export default { educateTypeList:['入场三级教育','定期安全教育','安全技术交底','VR安全教育'], signInInfo:'签到信息', photo:'培训照片', + trainDateTime:'培训时间', selectWorker: '选择工人', allGroup:'全部班组', allCompany:'全部企业', diff --git a/src/assets/js/http.js b/src/assets/js/http.js index f0a0fe28..55d91650 100644 --- a/src/assets/js/http.js +++ b/src/assets/js/http.js @@ -40,7 +40,7 @@ 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://192.168.34.125:6033/' + axios.defaults.baseURL = 'http://192.168.34.125:6023/' // 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 bcb1b46b..fde8c534 100644 --- a/src/store/index.js +++ b/src/store/index.js @@ -53,8 +53,8 @@ export default new Vuex.Store({ // FILEURL: 'http://124.71.178.44:100/image/', /* 2022-06-06 */ // tag: 本地测试接口 - UPLOADURL: 'http://192.168.34.125:6033/upload/image', - FILEURL: 'http://192.168.34.125:6033/image/', + UPLOADURL: 'http://192.168.34.125:6023/upload/image', + FILEURL: 'http://192.168.34.125:6023/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 8aadbfb9..22364d40 100644 --- a/src/views/projectFront/laborManage/safetyTrainManage.vue +++ b/src/views/projectFront/laborManage/safetyTrainManage.vue @@ -205,6 +205,33 @@ style="width: 100%" > + + + + + + - +
- +