diff --git a/src/assets/i18n/langs/cn/carManage/carManage.js b/src/assets/i18n/langs/cn/carManage/carManage.js index f13e555c..0f4f1f08 100644 --- a/src/assets/i18n/langs/cn/carManage/carManage.js +++ b/src/assets/i18n/langs/cn/carManage/carManage.js @@ -31,6 +31,10 @@ export default { out:'出', carPhotosUrl: '车辆图片', carType: '车辆类型', + carModuleType: '固定/临时车辆', + reserveStartTime: '预约开始时间', + reserveEndTime: '预约结束时间', + entryAndExitPermit: '允许进出次数', carType2: '车型', carTypeArr: ['渣土车辆', '外来车辆', '工作车辆'],//1渣土车辆,2外来车辆,3工作车辆 // createTime: '创建时间', diff --git a/src/assets/i18n/langs/cn/safeMangeCheck.js b/src/assets/i18n/langs/cn/safeMangeCheck.js index f5acbe3e..1d61dd30 100644 --- a/src/assets/i18n/langs/cn/safeMangeCheck.js +++ b/src/assets/i18n/langs/cn/safeMangeCheck.js @@ -125,6 +125,7 @@ export default { yesOrNoNeedChange:'是否需要整改', noNeedChange:'无需整改', askFinshTime:'要求完成时间', + inspectTime:'检查时间', chooseDate:'选择日期', answerSuccess:'回复成功', deleteSuccess:'删除成功', diff --git a/src/views/projectFront/carManage/carManage.vue b/src/views/projectFront/carManage/carManage.vue index 35f599ad..6ceff063 100644 --- a/src/views/projectFront/carManage/carManage.vue +++ b/src/views/projectFront/carManage/carManage.vue @@ -162,6 +162,38 @@ label-width="120px" class="dialogFormBox" > + + + + + + + + + + + + + + + + + + + + + + + @@ -350,6 +392,7 @@ export default { }, data() { return { + time: '', COMPANY: COMPANY, fileList: [], showImgUrl: '', @@ -420,6 +463,9 @@ export default { } }, methods: { + testCOnsole(){ + console.log(this.time); + }, //限制只能输入英文和数字 // handleInput() { // // 使用正则表达式匹配只允许输入英文和数字 diff --git a/src/views/projectFront/safeManage/v2/checkStandingBook.vue b/src/views/projectFront/safeManage/v2/checkStandingBook.vue index cdd5ed79..458947d6 100644 --- a/src/views/projectFront/safeManage/v2/checkStandingBook.vue +++ b/src/views/projectFront/safeManage/v2/checkStandingBook.vue @@ -165,7 +165,7 @@ @@ -373,7 +373,7 @@ $t('message.safeMangeCheck.time') + ':' }} - {{ detailData.createTime }} + {{ detailData.inspectTime }} @@ -852,12 +852,26 @@ + + + + + + - - + + { diff --git a/src/views/projectFront/safeManage/v2/inspectionRecord.vue b/src/views/projectFront/safeManage/v2/inspectionRecord.vue index 82c6c766..e5ee488c 100644 --- a/src/views/projectFront/safeManage/v2/inspectionRecord.vue +++ b/src/views/projectFront/safeManage/v2/inspectionRecord.vue @@ -103,7 +103,7 @@ @@ -315,7 +315,7 @@ $t('message.safeMangeCheck.time') + ':' }} - {{ detailData.createTime }} + {{ detailData.inspectTime }} @@ -721,6 +721,25 @@ + + + + + + + + + @@ -1028,7 +1048,8 @@ export default { checkItem2: '', changeUser: '', enterpriseSn: '', - changeLimitTime: '' + changeLimitTime: '', + inspectTime: '' }, opts: { value: 'id', @@ -1127,6 +1148,14 @@ export default { trigger: 'change' } ], + inspectTime: [ + { + // 请选择检查时间 + required: true, + message:"请选择检查时间", + trigger: 'change' + } + ], checkItem: [ { // 请选择隐患类型 @@ -1303,6 +1332,7 @@ export default { imgList.push(item.name) }) let data = { + inspectTime: this.formData.inspectTime, changeLimitTime: this.formData.changeLimitTime, changeUser: this.formData.changeUser, checkContent: this.formData.checkContent, diff --git a/src/views/projectFront/towerCrane/alarmsTable.vue b/src/views/projectFront/towerCrane/alarmsTable.vue index 2466b581..80c82a33 100644 --- a/src/views/projectFront/towerCrane/alarmsTable.vue +++ b/src/views/projectFront/towerCrane/alarmsTable.vue @@ -456,7 +456,8 @@ export default { hours >= 0 && hours <= 9 ? (hours = "0" + hours) : ""; minutes >= 0 && minutes <= 9 ? (minutes = "0" + minutes) : ""; seconds >= 0 && seconds <= 9 ? (seconds = "0" + seconds) : ""; - var timer = year + '-' + month + '-' + day + ' ' + hours + ':' + minutes+ ':' + seconds; + // var timer = year + '-' + month + '-' + day + ' ' + hours + ':' + minutes+ ':' + seconds; + let timer = year + '-' + month + '-' + day + ' ' + '00:00:00'; // var timer = year + '-' + month + '-' + day let timerOut = year + '-' + month + '-' + day + ' ' + '23:59:59' this.valueTime = [timer, timerOut] diff --git a/src/views/projectFront/towerCrane/liveDataTable.vue b/src/views/projectFront/towerCrane/liveDataTable.vue index 04314879..2af1e3e6 100644 --- a/src/views/projectFront/towerCrane/liveDataTable.vue +++ b/src/views/projectFront/towerCrane/liveDataTable.vue @@ -478,10 +478,11 @@ export default { hours >= 0 && hours <= 9 ? (hours = "0" + hours) : ""; minutes >= 0 && minutes <= 9 ? (minutes = "0" + minutes) : ""; seconds >= 0 && seconds <= 9 ? (seconds = "0" + seconds) : ""; - var timer = year + '-' + month + '-' + day + ' ' + hours + ':' + minutes+ ':' + seconds; + // var timer = year + '-' + month + '-' + day + ' ' + hours + ':' + minutes+ ':' + seconds; + let timer = year + '-' + month + '-' + day + ' ' + '00:00:00'; // var timer = year + '-' + month + '-' + day let timerOut = year + '-' + month + '-' + day + ' ' + '23:59:59' - this.valueTime = [timer, timerOut] + this.valueTime = [timer, timerOut] console.log(timer) // return timer; }, diff --git a/src/views/projectFront/towerCrane/violationData.vue b/src/views/projectFront/towerCrane/violationData.vue index 94078a6a..324fc59f 100644 --- a/src/views/projectFront/towerCrane/violationData.vue +++ b/src/views/projectFront/towerCrane/violationData.vue @@ -226,7 +226,8 @@ export default { hours >= 0 && hours <= 9 ? (hours = '0' + hours) : '' minutes >= 0 && minutes <= 9 ? (minutes = '0' + minutes) : '' seconds >= 0 && seconds <= 9 ? (seconds = '0' + seconds) : '' - var timer = year + '-' + month + '-' + day + ' ' + hours + ':' + minutes+ ':' + seconds; + // var timer = year + '-' + month + '-' + day + ' ' + hours + ':' + minutes+ ':' + seconds; + let timer = year + '-' + month + '-' + day + ' ' + '00:00:00'; // var timer = year + '-' + month + '-' + day let timerOut = year + '-' + month + '-' + day + ' ' + '23:59:59' this.valueTime = [timer, timerOut] diff --git a/src/views/projectFront/towerCrane/wireRopeMonitoring.vue b/src/views/projectFront/towerCrane/wireRopeMonitoring.vue index fa997e61..65a25fc4 100644 --- a/src/views/projectFront/towerCrane/wireRopeMonitoring.vue +++ b/src/views/projectFront/towerCrane/wireRopeMonitoring.vue @@ -206,9 +206,11 @@ export default { hours >= 0 && hours <= 9 ? (hours = '0' + hours) : '' minutes >= 0 && minutes <= 9 ? (minutes = '0' + minutes) : '' seconds >= 0 && seconds <= 9 ? (seconds = '0' + seconds) : '' - var timer = year + '-' + month + '-' + day + ' ' + hours + ':' + minutes + ':' + seconds; + // var timer = year + '-' + month + '-' + day + ' ' + hours + ':' + minutes + ':' + seconds; + let timer = year + '-' + month + '-' + day + ' ' + '00:00:00'; // var timer = year + '-' + month + '-' + day - this.timeValue = [timer, timer] + let timerOut = year + '-' + month + '-' + day + ' ' + '23:59:59' + this.timeValue = [timer, timerOut] console.log(timer) // return timer; }, diff --git a/src/views/projectFront/towerCrane/workCycleTable.vue b/src/views/projectFront/towerCrane/workCycleTable.vue index 94da82a5..c8522024 100644 --- a/src/views/projectFront/towerCrane/workCycleTable.vue +++ b/src/views/projectFront/towerCrane/workCycleTable.vue @@ -527,7 +527,8 @@ export default { hours >= 0 && hours <= 9 ? (hours = '0' + hours) : '' minutes >= 0 && minutes <= 9 ? (minutes = '0' + minutes) : '' seconds >= 0 && seconds <= 9 ? (seconds = '0' + seconds) : '' - let timer = year + '-' + month + '-' + day + ' ' + hours + ':' + minutes+ ':' + seconds; + // let timer = year + '-' + month + '-' + day + ' ' + hours + ':' + minutes+ ':' + seconds; + let timer = year + '-' + month + '-' + day + ' ' + '00:00:00'; // var timer = year + '-' + month + '-' + day let timerOut = year + '-' + month + '-' + day + ' ' + '23:59:59' this.valueTime = [timer, timerOut]