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%"
>
+
+
+
+
+
+
-
+
@@ -426,8 +455,13 @@ export default {
eduContent: "",
eduCourseName: "",
eduPhoto: "",
+ eduBeforePhoto: "",
+ eduInPhoto: "",
+ eduAfterPhoto: "",
eduTeacher: "",
eduTime: "",
+ eduStartTime: '',
+ eduEndTime: '',
eduType: 1,
list: [],
workernum: 0,
@@ -460,11 +494,6 @@ export default {
allPersonList: [],
educateTypeList: this.$t("message.laborDev.educateTypeList"),
selectWorkerDialog: false,
- eduPhotos: {
- photo1: '',
- photo2: '',
- photo3: '',
- }
};
},
mounted() {
@@ -476,7 +505,7 @@ export default {
methods: {
handleUpload(res, num) {
const imageUrl = res.data[0].imageUrl
- this.eduPhotos['photo' + num] = imageUrl
+ this.cardForm[`edu${num === 1 ? 'Before': num === 2 ? 'In' : 'After'}Photo`] = imageUrl
console.log(this.eduPhoto1,this.eduPhoto2,this.eduPhoto3, num);
},
handlePreview(file,type){
@@ -762,4 +791,13 @@ export default {
line-height: 80px;
text-align: center;
}
+.startTime, .endTime{
+ width: 160px !important;
+ /deep/.el-input__inner{
+ width: 140px;
+ }
+}
+/deep/.el-date-editor{
+ width: 120px;
+}